zcloud_gbs
/
zcloud_gbs_basic_info_gwj
12
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

main
SondonYong 2025-11-28 16:52:53 +08:00
parent 226ada2536 bdc6c47493
commit 2f37b250b1
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,14 +96,15 @@ public class CorpInfoQueryExe {
if(CollUtil.isEmpty(pageResponse.getData())) {
return PageResponse.of(Collections.EMPTY_LIST, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());
}
List<CorpDepartmentE> corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData());
List<CorpDepartmentE> corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData());
corpInfoList.forEach(corpInfo -> {
Map<String, Object> departParmas = new HashMap<>();
departParmas.put("eqId",corpInfo.getId());
List<DepartmentDO> list = departmentRepository.listByParams(departParmas);
List<DepartmentE> departmentES = corpInfoCoConvertor.converDOsToDepartE(list);
corpInfo.addDepart(departmentES);
if(CollUtil.isNotEmpty( list)){
List<DepartmentE> departmentES = corpInfoCoConvertor.converDOsToDepartE(list);
corpInfo.addDepart(departmentES);
}
});

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

@ -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(