Procházet zdrojové kódy

人员更新-处理组织架构更新

zhouy před 3 roky
rodič
revize
3c1af4e274

+ 6 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasEmployeeService.java

@@ -441,6 +441,7 @@ public class UasEmployeeService extends AbstractService {
             return;
             return;
         }
         }
         logger.info("query by mobile :"+employee.getEm_mobile());
         logger.info("query by mobile :"+employee.getEm_mobile());
+        List<HrOrg> orgList = getOrgListByEmployee(employee);
         if(StringUtils.hasText(employee.getEm_qywx())) {
         if(StringUtils.hasText(employee.getEm_qywx())) {
             GetUserInfoResp getUserInfoResp = addrBookSdk.getUserInfoByMobile(employee.getEm_mobile());
             GetUserInfoResp getUserInfoResp = addrBookSdk.getUserInfoByMobile(employee.getEm_mobile());
             logger.info("query by mobile{} , userID:", employee.getEm_mobile(), getUserInfoResp.getUserId() );
             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())){
                     if(StringUtils.hasText(employee.getEm_position())){
                         req.position(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));
                     addrBookSdk.updateUser(req.userId(employee.getEm_qywx()).enable(true));
                     if(employee.getEm_qywx() !=getUserInfoResp.getUserId()){
                     if(employee.getEm_qywx() !=getUserInfoResp.getUserId()){
                         employee.setEm_qywx(getUserInfoResp.getUserId());
                         employee.setEm_qywx(getUserInfoResp.getUserId());
@@ -485,7 +491,6 @@ public class UasEmployeeService extends AbstractService {
 
 
         }else {
         }else {
             //--创建人员
             //--创建人员
-            List<HrOrg> orgList = getOrgListByEmployee(employee);
             createUser(employee, orgList);
             createUser(employee, orgList);
             employee.setEm_qywx(employee.getEm_code());
             employee.setEm_qywx(employee.getEm_code());
             setQywx(employee);
             setQywx(employee);