fix

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

@@ -139,16 +139,24 @@ public class MessageApiServiceImpl implements MessageApiService {
         departmentDTO.setIsStore(0);
         //departmentDTO.setRelatedId(qywxCallBackDTO.getId()+"");
         TabHaobanWxEnterprise enterprise = this.enterpriseService.getEnterpriseBycorpId(qywxCallBackDTO.getAuthCorpId());
-        TabHaobanDepartment parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", enterprise.getWxEnterpriseId());
+        TabHaobanDepartment parentDepartment = new TabHaobanDepartment();
+        if(qywxCallBackDTO.getParentId() != null){
+        	parentDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getParentId() + "", enterprise.getWxEnterpriseId());
+        }else{
+        	TabHaobanDepartment oldDepartment = this.departmentService.getByWxId(qywxCallBackDTO.getId() + "", enterprise.getWxEnterpriseId());
+        	if(oldDepartment != null){
+        		parentDepartment = departmentService.selectById(oldDepartment.getParentDepartmentId());
+        	}
+        }
         if(!qywxCallBackDTO.getChangeType().equals(WxEditType.DELETEDEPART.getCode())){
         	 if(parentDepartment == null){
-            	 log.info("微信同步父部门不存在");
+            	log.info("微信同步父部门不存在");
                 return;
             }
-        	 departmentDTO.setParentDepartmentId(parentDepartment.getDepartmentId());
-             departmentDTO.setChainId(parentDepartment.getChainId()+ Constant.ID_SEPARATOR + parentDepartment.getDepartmentId());
-             departmentDTO.setChainName(parentDepartment.getChainName() + Constant.NAME_SEPARATOR + parentDepartment.getChainName());
-             departmentDTO.setLevel(parentDepartment.getLevel() + 1);
+        	departmentDTO.setParentDepartmentId(parentDepartment.getDepartmentId());
+            departmentDTO.setChainId(parentDepartment.getChainId()+ Constant.ID_SEPARATOR + parentDepartment.getDepartmentId());
+            departmentDTO.setChainName(parentDepartment.getChainName() + Constant.NAME_SEPARATOR + parentDepartment.getChainName());
+            departmentDTO.setLevel(parentDepartment.getLevel() + 1);
         }
         departmentDTO.setWxEnterpriseId(enterprise.getWxEnterpriseId());
         departmentDTO.setWxDepartmentId(qywxCallBackDTO.getId()+"");