diff --git a/app/Admin/Controllers/Store/EmployeeController.php b/app/Admin/Controllers/Store/EmployeeController.php index d4fe3ba..debcba8 100644 --- a/app/Admin/Controllers/Store/EmployeeController.php +++ b/app/Admin/Controllers/Store/EmployeeController.php @@ -33,7 +33,7 @@ class EmployeeController extends AdminController ->valueField('id') ->columnRatio(3) ->clearable(), - amisMake()->TextControl()->name('employee_search')->label(__('store.employees'))->placeholder('姓名/电话')->columnRatio(3)->clearable(), + amisMake()->TextControl()->name('search')->label(__('store.employees'))->placeholder('姓名/电话')->columnRatio(3)->clearable(), ]), ])) ->filterDefaultVisible() diff --git a/app/Http/Controllers/Api/Hr/EmployeeController.php b/app/Http/Controllers/Api/Hr/EmployeeController.php index 49f9092..59e48ca 100644 --- a/app/Http/Controllers/Api/Hr/EmployeeController.php +++ b/app/Http/Controllers/Api/Hr/EmployeeController.php @@ -24,10 +24,10 @@ class EmployeeController extends Controller $filter = $request->all(); $query = Employee::with(['jobs', 'store', 'adminUser'])->filter($filter)->enable(); - if (!in_array(UserRole::Admin->value, $role)) { + if (!in_array(UserRole::Admin, $role)) { $query->whereIn('store_id', [$user->store_id]); } - $list = $query->paginate($request->input('per_page')); + $list = $query->orderBy('id', 'desc')->paginate($request->input('per_page')); return EmployeeResource::collection($list); }