Merge remote-tracking branch 'origin/main' into main

web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java

@@ -101,9 +101,10 @@ public class CorpInfoQueryExe {
             Map<String, Object> departParmas = new HashMap<>();
             departParmas.put("eqId",corpInfo.getId());
             List<DepartmentDO> list = departmentRepository.listByParams(departParmas);
+            if(CollUtil.isNotEmpty( list)){
                 List<DepartmentE> departmentES = corpInfoCoConvertor.converDOsToDepartE(list);
-
                 corpInfo.addDepart(departmentES);
+            }
 
         });
 

web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java

@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 
@@ -50,7 +51,10 @@ public class CorpDepartmentE extends ClientObject {
 
 
     public void addDepart(List<DepartmentE> list) {
+        //过滤掉为null的
+
         Map<String, Integer> levelToDepartmentMap = list.stream()
+                .filter(Objects::nonNull)
                 .collect(Collectors.groupingBy(
                         DepartmentE::getLevel,
                         Collectors.collectingAndThen(