|
|
@@ -43,6 +43,8 @@ class Employee extends Controller
|
|
|
$role_ids =[];
|
|
|
$department_name = request('department_name', '');
|
|
|
$department_ids =[];
|
|
|
+ $city_name = request('city_name', '');
|
|
|
+ $city_ids =[];
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -60,6 +62,9 @@ class Employee extends Controller
|
|
|
if ($role_name){
|
|
|
$role_ids= $RolesModel->where('name','like',"%$role_name%")->pluck('id')->toarray();
|
|
|
}
|
|
|
+ if ($city_name){
|
|
|
+ $city_ids= $CitysModel->where('name','like',"%$city_name%")->pluck('id')->toarray();
|
|
|
+ }
|
|
|
$field = ['id','employee_code', 'name','mobile', 'department_id', 'role_id', 'city_ids', 'open_notice','insert_time','update_time','status'];
|
|
|
// 查询数据
|
|
|
$result_model = $EmployeeModel->query();
|
|
|
@@ -69,6 +74,9 @@ class Employee extends Controller
|
|
|
if ($role_name) {
|
|
|
$result_model = $result_model->whereIn('role_id', $role_ids);
|
|
|
}
|
|
|
+ if ($city_name) {
|
|
|
+ $result_model = $result_model->whereIn('city_ids', $city_ids);
|
|
|
+ }
|
|
|
$result =$result_model
|
|
|
->where($map)
|
|
|
->select($field)
|
