From 08fd4da6eb91c5d82db58fdce58b95da1ca9f402 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 7 Jan 2026 14:50:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=89=80=E6=9C=89=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E9=83=A8=E9=97=A8=E6=A0=91=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=B1=BB=E5=9E=8B=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zcloud/basic/info/web/DepartmentController.java | 4 ++-- .../info/command/query/DepartmentQueryExe.java | 7 ++++--- .../basic/info/service/DepartmentServiceImpl.java | 4 ++-- .../zcloud/basic/info/api/DepartmentServiceI.java | 2 +- .../zcloud/basic/info/dto/DepartmentTreeQry.java | 4 ++++ .../info/persistence/mapper/DepartmentMapper.java | 3 ++- .../repository/DepartmentRepository.java | 2 +- .../repository/impl/DepartmentRepositoryImpl.java | 4 ++-- .../src/main/resources/mapper/DepartmentMapper.xml | 13 ++++++++++++- 9 files changed, 30 insertions(+), 13 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java index 14537724..1601bc4a 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/DepartmentController.java @@ -87,8 +87,8 @@ public class DepartmentController { } @ApiOperation("所有企业下部门树状所有数据") @PostMapping("/listAllTree") - public MultiResponse listAllTree() { - return MultiResponse.of(departmentService.listAllTree()); + public MultiResponse listAllTree( @RequestBody DepartmentTreeQry qry) { + return MultiResponse.of(departmentService.listAllTree(qry)); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java index 32ca6750..4bb10960 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/DepartmentQueryExe.java @@ -151,14 +151,15 @@ public class DepartmentQueryExe { return departmentCoConvertor.converDOsToCOs(list); } - public List listAllTree() { + public List listAllTree(DepartmentTreeQry departmentQry) { + Map parmas = PageQueryHelper.toHashMap(departmentQry); - List pageResponse = departmentRepository.listAllTree(); + List pageResponse = departmentRepository.listAllTree(parmas); if (CollUtil.isEmpty(pageResponse)) { return Collections.emptyList(); } List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); - Map corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).collect(Collectors.toList())); + Map corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).distinct().collect(Collectors.toList())); if (CollUtil.isNotEmpty(corpinfoMap)) { List departmentIds = examCenterCOS.stream().peek(examCenterCO -> { examCenterCO.setCorpinfoName(corpinfoMap.getOrDefault(examCenterCO.getCorpinfoId(), StringUtils.EMPTY)); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java index 22520e0e..b6e6c298 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/DepartmentServiceImpl.java @@ -85,8 +85,8 @@ public class DepartmentServiceImpl implements DepartmentServiceI { } @Override - public List listAllTree() { - return departmentQueryExe.listAllTree(); + public List listAllTree(DepartmentTreeQry qry) { + return departmentQueryExe.listAllTree(qry); } @Override @Cacheable(value = "deptAllNameCache", key="'deptId:'+#deptId") diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java index 93f03d61..81de1888 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/DepartmentServiceI.java @@ -38,7 +38,7 @@ public interface DepartmentServiceI { List getDeptList(); - List listAllTree(); + List listAllTree(DepartmentTreeQry qry); String getFullNameForList(Long deptId, List list); diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java index 6c856dd4..5d7198ec 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/DepartmentTreeQry.java @@ -4,6 +4,8 @@ import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * web-client @@ -29,6 +31,8 @@ public class DepartmentTreeQry { private Long eqCorpinfoId; @ApiModelProperty(value = "父id", name = "eqParentId") private Long eqParentId; + @ApiModelProperty(value = "企业类型列表", name = "corpinfoTypeList") + private List corpinfoTypeList; } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java index 2dd78259..b847e524 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/mapper/DepartmentMapper.java @@ -11,6 +11,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * web-infrastructure @@ -24,7 +25,7 @@ import java.util.List; }) public interface DepartmentMapper extends BaseMapper { - List listAllTree(); + List listAllTree(Map parmas); IPage selectDeptPage(IPage iPage, @Param("ew") QueryWrapper queryWrapper, String menuPerms); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java index 99121c77..5e7040d1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/DepartmentRepository.java @@ -33,7 +33,7 @@ public interface DepartmentRepository extends BaseRepository { void updateInfoById(DepartmentDO departmentDO); - List listAllTree(); + List listAllTree(Map parmas); boolean existsByName(@NotEmpty(message = "名称不能为空") String name); } diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java index 19cc67c4..9e52995a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/DepartmentRepositoryImpl.java @@ -126,8 +126,8 @@ public class DepartmentRepositoryImpl extends BaseRepositoryImpl listAllTree() { - return departmentMapper.listAllTree(); + public List listAllTree(Map parmas) { + return departmentMapper.listAllTree(parmas); } @Override diff --git a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml index e75ad3e8..e19bf30d 100644 --- a/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/DepartmentMapper.xml @@ -5,7 +5,18 @@