From ae8bfd5635ce85f992183664171d6b5a391e4d40 Mon Sep 17 00:00:00 2001 From: zhangyue Date: Thu, 18 Dec 2025 11:46:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=85=A8=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../facade/ZcloudDepartmentFacadeImpl.java | 3 ++- .../command/query/DepartmentQueryExe.java | 16 ++++++++++++-- .../info/command/query/UserQueryExe.java | 4 +++- .../info/service/DepartmentServiceImpl.java | 8 +++++++ .../basic/info/api/DepartmentServiceI.java | 6 +++++ .../zcloud/basic/info/dto/UserPageQry.java | 1 + .../com/zcloud/basic/info/dto/UserQryCmd.java | 1 + .../clientobject/DepartmentTreeInfoCO.java | 6 +++++ .../persistence/dataobject/DepartmentDO.java | 9 ++++++++ .../repository/impl/UserRepositoryImpl.java | 22 +++++++++++-------- 10 files changed, 63 insertions(+), 13 deletions(-) diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java index 4a413f71..f9c32b0d 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudDepartmentFacadeImpl.java @@ -93,9 +93,10 @@ public class ZcloudDepartmentFacadeImpl implements ZcloudDepartmentFacade { @Override public Map listFullName(List list) { + List deptlist = departmentService.getDeptList(); Map map = new HashMap<>(); for (Long id : list){ - map.put(id, getFullName(id)); + map.put(id, departmentService.getFullNameForList(id, deptlist)); } return map; } 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 c2d1aef2..32ca6750 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 @@ -15,8 +15,10 @@ import com.zcloud.basic.info.persistence.repository.DepartmentSuperviseRepositor import com.zcloud.basic.info.persistence.repository.UserRepository; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.gbscommon.utils.Tools; +import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade; import lombok.AllArgsConstructor; import org.apache.commons.lang3.StringUtils; +import org.apache.dubbo.config.annotation.DubboReference; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Component; @@ -38,6 +40,8 @@ public class DepartmentQueryExe { private final DepartmentSuperviseRepository departmentSuperviseRepository; private final UserRepository userRepository; private final CorpInfoRepository corpInfoRepository; + @DubboReference + private ZcloudDepartmentFacade zcloudDepartmentFacade; /** * 分页 @@ -85,8 +89,12 @@ public class DepartmentQueryExe { //补充企业名称 Map corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).collect(Collectors.toList())); if (CollUtil.isNotEmpty(corpinfoMap)) { - examCenterCOS.forEach(examCenterCO -> { + List departmentIds = examCenterCOS.stream().peek(examCenterCO -> { examCenterCO.setCorpinfoName(corpinfoMap.getOrDefault(examCenterCO.getCorpinfoId(), StringUtils.EMPTY)); + }).map(DepartmentTreeInfoCO :: getId).collect(Collectors.toList()); + Map deptMap = zcloudDepartmentFacade.listFullName(departmentIds); + examCenterCOS.forEach(examCenterCO -> { + examCenterCO.setFullName(deptMap.getOrDefault(examCenterCO.getId(), StringUtils.EMPTY)); }); } //GBS部门根节点父部门是tenantId @@ -152,8 +160,12 @@ public class DepartmentQueryExe { List examCenterCOS = departmentCoConvertor.converDOsToInfoCOs(pageResponse); Map corpinfoMap = corpInfoRepository.getCorpinfoNameByCorpinfoId(examCenterCOS.stream().map(DepartmentTreeInfoCO::getCorpinfoId).collect(Collectors.toList())); if (CollUtil.isNotEmpty(corpinfoMap)) { - examCenterCOS.forEach(examCenterCO -> { + List departmentIds = examCenterCOS.stream().peek(examCenterCO -> { examCenterCO.setCorpinfoName(corpinfoMap.getOrDefault(examCenterCO.getCorpinfoId(), StringUtils.EMPTY)); + }).map(DepartmentTreeInfoCO :: getId).collect(Collectors.toList()); + Map deptMap = zcloudDepartmentFacade.listFullName(departmentIds); + examCenterCOS.forEach(examCenterCO -> { + examCenterCO.setFullName(deptMap.getOrDefault(examCenterCO.getId(), StringUtils.EMPTY)); }); } //GBS部门根节点父部门是tenantId diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 26f662d0..f1b96a95 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -32,6 +32,7 @@ import com.zcloud.gbscommon.utils.Tools; import com.zcloud.gbscommon.utils.ZcloudRedisUtil; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Component; import javax.servlet.http.HttpServletResponse; @@ -56,7 +57,8 @@ public class UserQueryExe { private final CorpInfoCoConvertor corpInfoCoConvertor; private ZcloudRedisUtil zcloudRedisUtil; - /** + + /** * 分页 * * @param userPageQry 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 b27c5ff9..22520e0e 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 @@ -12,8 +12,10 @@ import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentInfoCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; +import com.zcloud.gbscommon.utils.Tools; import lombok.AllArgsConstructor; import org.checkerframework.checker.units.qual.A; +import org.springframework.cache.annotation.Cacheable; import org.springframework.stereotype.Service; import java.util.Collection; @@ -86,5 +88,11 @@ public class DepartmentServiceImpl implements DepartmentServiceI { public List listAllTree() { return departmentQueryExe.listAllTree(); } + @Override + @Cacheable(value = "deptAllNameCache", key="'deptId:'+#deptId") + public String getFullNameForList(Long deptId, List list) { + String name = Tools.getTreeFullName(list,"id", "parentId", "name", deptId); + return name; + } } 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 c49c5ba7..93f03d61 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 @@ -7,6 +7,8 @@ import com.zcloud.basic.info.dto.clientobject.CorpDepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentCO; import com.zcloud.basic.info.dto.clientobject.DepartmentInfoCO; import com.zcloud.basic.info.dto.clientobject.DepartmentTreeInfoCO; +import com.zcloud.gbscommon.utils.Tools; +import org.springframework.cache.annotation.Cacheable; import java.util.Collection; import java.util.List; @@ -37,5 +39,9 @@ public interface DepartmentServiceI { List getDeptList(); List listAllTree(); + + String getFullNameForList(Long deptId, List list); + + } diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java index 2d4c5995..a2dbfa90 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserPageQry.java @@ -47,6 +47,7 @@ public class UserPageQry extends PageQuery { @ApiModelProperty(value = "身份证号") private String likeUserIdCard; + private String menuPath; private Integer noMain; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java index 586bc320..75a8bb14 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/UserQryCmd.java @@ -26,6 +26,7 @@ public class UserQryCmd { private String eqCorpinfoId; private String eqDepartmentId; private String eqPostId; + private Integer eqEmploymentFlag; private Long corpinfoId; private Long departmentId; diff --git a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentTreeInfoCO.java b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentTreeInfoCO.java index d0db99f8..3a6dceda 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentTreeInfoCO.java +++ b/web-client/src/main/java/com/zcloud/basic/info/dto/clientobject/DepartmentTreeInfoCO.java @@ -28,6 +28,12 @@ public class DepartmentTreeInfoCO extends ClientObject { //名称 @ApiModelProperty(value = "名称") private String name; + //名称 + @ApiModelProperty(value = "部门全称") + private String fullName; + //名称 + @ApiModelProperty(value = "id全拼接") + private String fullId; //父部门id @ApiModelProperty(value = "父部门id") private Long parentId; diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java index e926e807..1dba6f93 100644 --- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/dataobject/DepartmentDO.java @@ -1,6 +1,7 @@ package com.zcloud.basic.info.persistence.dataobject; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.jjb.saas.framework.repository.basedo.BaseDO; @@ -49,6 +50,14 @@ public class DepartmentDO extends BaseDO { private Integer securityFlag; @ApiModelProperty(value = "部门职能") private String departmentFunction; + //名称 + @ApiModelProperty(value = "部门全称") + @TableField(exist = false) + private String fullName; + //名称 + @ApiModelProperty(value = "id全拼接") + @TableField(exist = false) + private String fullId; } 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 a4ec74a4..57db8d0a 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 @@ -17,7 +17,6 @@ import com.jjb.saas.framework.repository.common.PageHelper; import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; import com.jjb.saas.message.client.message.facede.MessageFacade; import com.jjb.saas.message.client.todotask.facade.BusTodoTaskFacade; -import com.jjb.saas.message.client.todotask.request.HandelTaskAddCmd; import com.jjb.saas.system.client.role.facade.RoleFacade; import com.jjb.saas.system.client.role.response.RoleCO; import com.jjb.saas.system.client.user.facade.UserFacade; @@ -31,10 +30,8 @@ import com.zcloud.basic.info.persistence.dataobject.DepartmentLeaderStatictiscDO import com.zcloud.basic.info.persistence.dataobject.UserDO; import com.zcloud.basic.info.persistence.mapper.UserMapper; import com.zcloud.basic.info.persistence.repository.UserRepository; -import com.zcloud.gbscommon.utils.PageQueryHelper; -import com.zcloud.gbscommon.utils.Query; -import com.zcloud.gbscommon.utils.Tools; -import com.zcloud.gbscommon.utils.UuidUtil; +import com.zcloud.gbscommon.utils.*; +import com.zcloud.gbscommon.zclouddepartment.face.ZcloudDepartmentFacade; import com.zcloud.gbscommon.zcloudimgfiles.facade.ZcloudImgFilesFacade; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -45,10 +42,8 @@ import org.springframework.stereotype.Service; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import javax.annotation.Resource; +import java.util.*; import java.util.stream.Collectors; /** @@ -132,8 +127,17 @@ public class UserRepositoryImpl extends BaseRepositoryImpl i @DubboReference private BusTodoTaskFacade busTodoTaskFacade; +// @DubboReference +// private ZcloudDepartmentFacade zcloudDepartmentFacade; + @Override public List listAll(Map params) { +// SSOUser ssoUsexr = AuthContext.getCurrentUser(); +// String sd = zcloudDepartmentFacade.getFullName(1999009782763397120L); +// List ids = new ArrayList<>(); +// ids.add(1999009782763397120L); +// Map sd1 = zcloudDepartmentFacade.listFullName(ids); + if (!ObjectUtils.isEmpty(params.get("corpinfoId"))) { SSOUser ssoUser = AuthContext.getCurrentUser(); params.put("corpinfoId", ssoUser.getTenantId());