|
|
@@ -51,7 +51,7 @@ class Employee extends Controller
|
|
|
$role_ids = [];
|
|
|
$city_ids = request('city_ids', '');
|
|
|
$department_ids = request('department_ids', '');
|
|
|
- $EmployeeModel_Area = new EmployeeModel();
|
|
|
+ $EmployeeModel_Other = new EmployeeModel();
|
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
|
@@ -132,7 +132,8 @@ class Employee extends Controller
|
|
|
$result['data'][$key]['department_ids'] = $value['department_ids'] != '' ? substr($value['department_ids'], 1, strlen($value['department_ids']) - 2) : '';
|
|
|
$result['data'][$key]['department_name'] = $department_name;
|
|
|
$result['data'][$key]['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
|
|
|
- $result['data'][$key]['area_info'] = $EmployeeModel_Area->get_area_info($value['id']);
|
|
|
+ $result['data'][$key]['area_info'] = $EmployeeModel_Other->get_area_info($value['id']);
|
|
|
+ $result['data'][$key]['platform_id'] = $EmployeeModel_Other->get_platform_info($value['id']);
|
|
|
}
|
|
|
}
|
|
|
// 加载模板
|
|
|
@@ -259,7 +260,8 @@ class Employee extends Controller
|
|
|
} else {
|
|
|
$map['company_id'] = $admin_company_id;
|
|
|
}
|
|
|
- $field = ['id', 'employee_code', 'band_wechat', 'name', 'mobile', 'email', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
+ $EmployeeModel_Other = new EmployeeModel();
|
|
|
+ $field = ['id', 'employee_code', 'band_wechat', 'name', 'mobile', 'email', 'department_ids', 'duty_type', 'role_id', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
$data = $EmployeeModel->where($map)->select($field)->first();
|
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
|
// 查询部门信息
|
|
|
@@ -274,17 +276,12 @@ class Employee extends Controller
|
|
|
$role_where['company_id'] = $admin_company_id;
|
|
|
}
|
|
|
$role_info = $RolesModel->where($role_where)->first();
|
|
|
- // 查询城市信息
|
|
|
- $city_ids = explode(',', $data['city_ids']);
|
|
|
- $city_info = [];
|
|
|
- if (count($city_ids) > 0) {
|
|
|
- $city_info = $CitysModel->whereIn('id', $city_ids)->pluck('name');
|
|
|
- }
|
|
|
//截取字符串
|
|
|
$data['department_ids'] = $data['department_ids'] != '' ? substr($data['department_ids'], 1, strlen($data['department_ids']) - 2) : '';
|
|
|
$data['department_name'] = isset($department_info) ? array_column($department_info, 'name') : '';
|
|
|
$data['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
|
|
|
- $data['city_info'] = $city_info;
|
|
|
+ $data['area_info'] = $EmployeeModel_Other->get_area_info($data['id']);
|
|
|
+ $data['platform_id'] = $EmployeeModel_Other->get_platform_info($data['id']);
|
|
|
// 加载模板
|
|
|
return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => $data]);
|
|
|
}
|