加日志

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

@@ -122,7 +122,8 @@ public class MessageApiServiceImpl implements MessageApiService {
         departmentDTO.setDepartmentName(qywxCallBackDTO.getDepartmentName());
         departmentDTO.setIsStore(0);
         departmentDTO.setRelatedId(qywxCallBackDTO.getId()+"");
-        TabHaobanDepartment parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "");
+        TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
+        TabHaobanDepartment parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", enterprise.getWxEnterpriseId());
         if(parentDepartment == null){
             return;
         }
@@ -130,14 +131,13 @@ public class MessageApiServiceImpl implements MessageApiService {
         departmentDTO.setChainId(parentDepartment.getChainId()+ Constant.ID_SEPARATOR + parentDepartment.getDepartmentId());
         departmentDTO.setChainName(parentDepartment.getChainName() + Constant.NAME_SEPARATOR + parentDepartment.getChainName());
         departmentDTO.setLevel(parentDepartment.getLevel() + 1);
-        TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
         departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
         departmentDTO.setWxDepartmentId(qywxCallBackDTO.getId()+"");
         if(qywxCallBackDTO.getChangeType().equals(WxEditType.ADDDEPART.getCode())){
             String response = this.departmentService.add(departmentDTO);
             log.info("微信同步新增部门：{}", JSON.toJSONString(response));
         }else if(qywxCallBackDTO.getChangeType().equals(WxEditType.UPDATEDEPART.getCode())){
-            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "");
+            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
             if(department == null){
                 String response = this.departmentService.add(departmentDTO);
                 log.info("微信同步新增部门：{}", JSON.toJSONString(response));
@@ -147,7 +147,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                 log.info("企业微信更新同步完成");
             }
         }else {
-            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "");
+            TabHaobanDepartment department = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
             if(department == null){
                 log.info("微信同步删除部门不存在");
             }else {
@@ -178,7 +178,7 @@ public class MessageApiServiceImpl implements MessageApiService {
                     staff.setStaffId(oldStaff.getStaffId());
                     this.staffService.updateByPrimaryKey(staff);
                     this.staffDepartmentRelatedService.delByUserid(qywxCallBackDTO.getUserid());
-                    this.addUserDepart(qywxCallBackDTO, oldStaff.getStaffId());
+                    this.addUserDepart(qywxCallBackDTO, oldStaff.getStaffId(), enterprise.getWxEnterpriseId());
                 }else {
                     this.addUser(qywxCallBackDTO, staff);
                 }
@@ -199,14 +199,14 @@ public class MessageApiServiceImpl implements MessageApiService {
     private void addUser(QywxCallBackDTO qywxCallBackDTO, TabHaobanStaff staff){
         String add = this.staffService.add(staff);
         log.info("新增用户返回结果：{}", add);
-        this.addUserDepart(qywxCallBackDTO, add);
+        this.addUserDepart(qywxCallBackDTO, add, staff.getWxEnterpriseId());
     }
 
-    private void addUserDepart(QywxCallBackDTO qywxCallBackDTO, String staffId){
+    private void addUserDepart(QywxCallBackDTO qywxCallBackDTO, String staffId, String wxEnterpriseId){
         String[] departArr = qywxCallBackDTO.getDepartment();
         if(departArr != null){
             for(String s : departArr){
-                TabHaobanDepartment department = this.departmentService.getByWxId(s);
+                TabHaobanDepartment department = this.departmentService.getByWxId(s, wxEnterpriseId);
                 if(department == null){
                     log.info("部门不存在");
                     continue;