|
|
@@ -39,6 +39,10 @@ class Employee extends Controller
|
|
|
$role_id = request('role_id', '');
|
|
|
$open_notice = request('open_notice', '');
|
|
|
$employee_code = request('employee_code', '');
|
|
|
+ $role_name = request('role_name', '');
|
|
|
+ $role_ids =[];
|
|
|
+ $department_name = request('department_name', '');
|
|
|
+ $department_ids =[];
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -50,9 +54,22 @@ class Employee extends Controller
|
|
|
if ($role_id) $map[] = ['role_id', '=', $role_id];
|
|
|
if (is_numeric($open_notice)) $map[] = ['open_notice', '=', $open_notice];
|
|
|
if ($employee_code) $map[] = ['employee_code', 'like', "%$employee_code%"];
|
|
|
+ if ($department_name){
|
|
|
+ $department_ids= $DepartmentModel->where('name','like',"%$department_name%")->pluck('id')->toarray();
|
|
|
+ }
|
|
|
+ if ($role_name){
|
|
|
+ $role_ids= $RolesModel->where('name','like',"%$role_name%")->pluck('id')->toarray();
|
|
|
+ }
|
|
|
$field = ['id','employee_code', 'name','mobile', 'department_id', 'role_id', 'city_ids', 'open_notice','insert_time','update_time','status'];
|
|
|
// 查询数据
|
|
|
- $result = $EmployeeModel->query()
|
|
|
+ $result_model = $EmployeeModel->query();
|
|
|
+ if (count($department_ids) > 0) {
|
|
|
+ $result_model = $result_model->whereIn('department_id', $department_ids);
|
|
|
+ }
|
|
|
+ if (count($role_ids) > 0) {
|
|
|
+ $result_model = $result_model->whereIn('role_id', $role_ids);
|
|
|
+ }
|
|
|
+ $result =$result_model
|
|
|
->where($map)
|
|
|
->select($field)
|
|
|
->orderByDesc('id')
|
