From bdc6c474934dfea20a98b6125e5905f182b0a2e3 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Fri, 28 Nov 2025 16:52:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/info/command/query/CorpInfoQueryExe.java | 9 +++++---- .../zcloud/basic/info/domain/model/CorpDepartmentE.java | 4 ++++ .../persistence/repository/impl/UserRepositoryImpl.java | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java index f3c41aa..7c5b6bd 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/CorpInfoQueryExe.java @@ -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 corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData()); + List corpInfoList = corpInfoCoConvertor.converDOsToCorpDepartCOs(pageResponse.getData()); corpInfoList.forEach(corpInfo -> { Map departParmas = new HashMap<>(); departParmas.put("eqId",corpInfo.getId()); List list = departmentRepository.listByParams(departParmas); - List departmentES = corpInfoCoConvertor.converDOsToDepartE(list); - - corpInfo.addDepart(departmentES); + if(CollUtil.isNotEmpty( list)){ + List departmentES = corpInfoCoConvertor.converDOsToDepartE(list); + corpInfo.addDepart(departmentES); + } }); diff --git a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java b/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java index d320c2c..14123e0 100644 --- a/web-domain/src/main/java/com/zcloud/basic/info/domain/model/CorpDepartmentE.java +++ b/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 list) { + //过滤掉为null的 + Map levelToDepartmentMap = list.stream() + .filter(Objects::nonNull) .collect(Collectors.groupingBy( DepartmentE::getLevel, Collectors.collectingAndThen( diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java index 12f92ca..a8d8672 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java @@ -158,7 +158,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("post_id", postId); queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); + queryWrapper.orderByAsc("sort").orderByDesc("create_time"); List userPostList = this.list(queryWrapper); return userPostList; } @@ -168,7 +168,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i QueryWrapper queryWrapper = new QueryWrapper(); queryWrapper.in("post_id", postIds); queryWrapper.eq("delete_enum", "FALSE"); - queryWrapper.orderByAsc("u.sort").orderByDesc("u.create_time"); + queryWrapper.orderByAsc("sort").orderByDesc("create_time"); List userPostList = this.list(queryWrapper); return userPostList; }