|
|
@@ -441,6 +441,7 @@ public class UasEmployeeService extends AbstractService {
|
|
|
return;
|
|
|
}
|
|
|
logger.info("query by mobile :"+employee.getEm_mobile());
|
|
|
+ List<HrOrg> orgList = getOrgListByEmployee(employee);
|
|
|
if(StringUtils.hasText(employee.getEm_qywx())) {
|
|
|
GetUserInfoResp getUserInfoResp = addrBookSdk.getUserInfoByMobile(employee.getEm_mobile());
|
|
|
logger.info("query by mobile{} , userID:", employee.getEm_mobile(), getUserInfoResp.getUserId() );
|
|
|
@@ -475,6 +476,11 @@ public class UasEmployeeService extends AbstractService {
|
|
|
if(StringUtils.hasText(employee.getEm_position())){
|
|
|
req.position(employee.getEm_position());
|
|
|
}
|
|
|
+ List<UpdateUserReq.Department> departmentList = new ArrayList<>(orgList.size());
|
|
|
+ for (HrOrg org : orgList) {
|
|
|
+ departmentList.add(new UpdateUserReq.Department(org.getOr_qywx(), null, employee.getEm_code().equals(org.getOr_headmancode())));
|
|
|
+ }
|
|
|
+ req.department(departmentList);
|
|
|
addrBookSdk.updateUser(req.userId(employee.getEm_qywx()).enable(true));
|
|
|
if(employee.getEm_qywx() !=getUserInfoResp.getUserId()){
|
|
|
employee.setEm_qywx(getUserInfoResp.getUserId());
|
|
|
@@ -485,7 +491,6 @@ public class UasEmployeeService extends AbstractService {
|
|
|
|
|
|
}else {
|
|
|
//--创建人员
|
|
|
- List<HrOrg> orgList = getOrgListByEmployee(employee);
|
|
|
createUser(employee, orgList);
|
|
|
employee.setEm_qywx(employee.getEm_code());
|
|
|
setQywx(employee);
|