From 36c02e099fe17d326ad7b44718c66009d81ead30 Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Sat, 22 Jul 2023 15:00:16 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/api/controller/CompanyController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/api/controller/CompanyController.php b/app/api/controller/CompanyController.php index 776846562..cdf9dd896 100644 --- a/app/api/controller/CompanyController.php +++ b/app/api/controller/CompanyController.php @@ -67,9 +67,12 @@ class CompanyController extends BaseApiController public function areaManager() { + [$page, $limit] = $this->getPage(); $adminIds = AdminRole::where('role_id', 8)->column('admin_id'); - $data = Admin::wherein('id', $adminIds)->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,name,account,avatar,province,city,area,street')->select()->toArray(); - return $this->success('success', $data); + $query = Admin::wherein('id', $adminIds); + $count = $query->count(); + $data = $query->page($page)->limit($limit)->append(['province_name', 'city_name', 'area_name', 'street_name'])->field('id,name,account,avatar,province,city,area,street')->select()->toArray(); + return $this->success('success', ['count' => $count, 'data' => $data]); } public function users()