|
@@ -68,7 +68,7 @@ class Employee extends Controller
|
|
|
}
|
|
}
|
|
|
$role_ids = $RolesModel->where($role_where)->pluck('id')->toarray();
|
|
$role_ids = $RolesModel->where($role_where)->pluck('id')->toarray();
|
|
|
}
|
|
}
|
|
|
- $field = ['id', 'employee_code', 'name', 'mobile','email','department_ids', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
|
|
|
|
+ $field = ['id', 'employee_code','band_wechat','name', 'mobile','email','department_ids', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
// 查询数据
|
|
// 查询数据
|
|
|
if (count($role_ids) > 0) {
|
|
if (count($role_ids) > 0) {
|
|
|
$employee_where = [];
|
|
$employee_where = [];
|
|
@@ -262,7 +262,7 @@ class Employee extends Controller
|
|
|
} else {
|
|
} else {
|
|
|
$map['company_id'] = $admin_company_id;
|
|
$map['company_id'] = $admin_company_id;
|
|
|
}
|
|
}
|
|
|
- $field = ['id', 'employee_code', 'name', 'mobile','email', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
|
|
|
|
+ $field = ['id', 'employee_code','band_wechat', '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();
|
|
$data = $EmployeeModel->where($map)->select($field)->first();
|
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
|
// 查询部门信息
|
|
// 查询部门信息
|
|
@@ -528,7 +528,7 @@ class Employee extends Controller
|
|
|
} else {
|
|
} else {
|
|
|
return json_send(['code' => 'error', 'msg' => '获取失败', 'data' =>'']);
|
|
return json_send(['code' => 'error', 'msg' => '获取失败', 'data' =>'']);
|
|
|
}
|
|
}
|
|
|
- $field = ['id', 'employee_code', 'name', 'mobile', 'email', 'department_ids', 'duty_type', 'role_id', 'city_ids', 'open_notice', 'insert_time', 'update_time', 'status'];
|
|
|
|
|
|
|
+ $field = ['id', 'employee_code','band_wechat', '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();
|
|
$data = $EmployeeModel->where($map)->select($field)->first();
|
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
if (!$data) return json_send(['code' => 'error', 'msg' => '记录不存在']);
|
|
|
// 查询部门信息
|
|
// 查询部门信息
|