|
|
@@ -59,7 +59,7 @@ class Employee extends Controller
|
|
|
if ($role_name) {
|
|
|
$role_ids = $RolesModel->where('name', 'like', "%$role_name%")->pluck('id')->toarray();
|
|
|
}
|
|
|
- $field = ['id', 'employee_code', 'name', 'mobile', 'department_ids', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
+ $field = ['id', 'employee_code', 'name', 'mobile','email','department_ids', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
// 查询数据
|
|
|
if ($role_name) {
|
|
|
$EmployeeModel = $EmployeeModel->whereIn('role_id', $role_ids);
|
|
|
@@ -194,7 +194,7 @@ class Employee extends Controller
|
|
|
// 接收参数
|
|
|
$id = request('id', 0);
|
|
|
$map = ['id' => $id];
|
|
|
- $field = ['id', 'employee_code', 'name', 'mobile', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
+ $field = ['id', 'employee_code', 'name', 'mobile','email', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
$data = $EmployeeModel->where($map)->select($field)->first();
|
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
|
// 查询部门信息
|