Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer

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

@@ -77,10 +77,16 @@ public class MessageApiServiceImpl implements MessageApiService {
             departmentDTO.setRelatedId(dto.getId());
             log.info("【部门同步】dto={}",JSON.toJSONString(dto));
             DepartmentDTO parentDepartment = this.getParentDepartment(dto.getParentChain(), dto.getType(), enterprise.getWxEnterpriseId());
-            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);
+            if(parentDepartment == null && (dto.getChangeType() == GicEditType.ADD.getCode() || dto.getChangeType() == GicEditType.UPDATE.getCode())){
+            	log.info("【部门同步】父部门为空");
+            	return;  
+            }
+            if(parentDepartment != null){
+            	 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());
             if(dto.getChangeType() == GicEditType.ADD.getCode()){
                 HaobanResponse response = this.departmentApiService.add(departmentDTO);
@@ -261,8 +267,8 @@ public class MessageApiServiceImpl implements MessageApiService {
                 }
             }
         }
-        DepartmentDTO departmentDTO = this.departmentService.getRootByEnterpriseId(wxEnterpriseId);
-        return departmentDTO;
+        //DepartmentDTO departmentDTO = this.departmentService.getRootByEnterpriseId(wxEnterpriseId);
+        return null;
     }
 
     public static void main(String[] args){