diff --git a/app/Service/Admin/System/CatererService.php b/app/Service/Admin/System/CatererService.php index 797803c..a95eef6 100644 --- a/app/Service/Admin/System/CatererService.php +++ b/app/Service/Admin/System/CatererService.php @@ -72,7 +72,23 @@ class CatererService extends BaseService */ public function catererList() { - return $this->return->success('success',['list' => []]); + $cityId = (int)$this->request->input('city_id',0); + if ($cityId <= 0) return $this->return->success('success',['list' => []]); + $roleId = (int)$this->request->input('role_id',RoleCode::OPTION_CATERING); + + $list = $this + ->adminUserModel + ->leftJoin('caterer', 'admin_user.id', '=', 'caterer.user_id') + ->where('admin_user.is_del',UserCode::IS_NO_DEL) + ->where('admin_user.status',UserCode::ENABLE) + ->where('admin_user.role_id',$roleId) + ->where('admin_user.city_id', $cityId) + ->orderBy('admin_user.id') + ->get(['admin_user.id','admin_user.chinese_name','caterer.type','caterer.kitchen_id']); + + if ($list->isEmpty()) return $this->return->success('success',['list' => []]); + + return $this->return->success('success',['list' => $list->toArray()]); } /** diff --git a/app/Service/Admin/System/DriverService.php b/app/Service/Admin/System/DriverService.php index 079251f..0364dde 100644 --- a/app/Service/Admin/System/DriverService.php +++ b/app/Service/Admin/System/DriverService.php @@ -110,7 +110,7 @@ class DriverService extends BaseService ->orderBy('driver_sequence.sequence') ->get(['admin_user.id','admin_user.chinese_name','driver_sequence.driver_num','driver_sequence.sequence']); - if (empty($list)) return $this->return->success('success',['list' => []]); + if ($list->isEmpty()) return $this->return->success('success',['list' => []]); return $this->return->success('success',['list' => $list->toArray()]); }