diff --git a/app/Request/Admin/ChefRequest.php b/app/Request/Admin/ChefRequest.php index 55f25f4..2108e36 100644 --- a/app/Request/Admin/ChefRequest.php +++ b/app/Request/Admin/ChefRequest.php @@ -40,7 +40,9 @@ class ChefRequest extends FormRequest 'query_chef_id' ], 'chef_detail_list' => [ + 'limit', 'query_city_id', + 'query_chef_name' ], 'setting_chef' => [ 'user_id', diff --git a/app/Service/Admin/System/ChefService.php b/app/Service/Admin/System/ChefService.php index 17cf4dd..ea873b9 100644 --- a/app/Service/Admin/System/ChefService.php +++ b/app/Service/Admin/System/ChefService.php @@ -55,6 +55,7 @@ class ChefService extends BaseService { $limit = (int)$this->request->input('limit', 10); $cityId = (int)$this->request->input('query_city_id'); + $name = $this->request->input('query_chef_name'); $list = $this ->chefModel @@ -65,6 +66,9 @@ class ChefService extends BaseService ->when(!empty($cityId), function ($query) use ($cityId) { $query->where('admin_user.city_id', $cityId); }) + ->when(!empty($name), function ($query) use ($name) { + $query->where('admin_user.chinese_name', 'like', "$name%"); + }) ->paginate($limit,['chef.id','admin_user.avatar','admin_user.chinese_name','chef.profile','chef.specialties'])->toArray(); if (empty($list)) return $this->return->success('success',['list' => []]);