From 34912c2ffadbb99eb66404db74088edf27325ca7 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 24 Dec 2024 15:07:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:[REQ-3282]=20=E8=A7=A3=E5=86=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/node/service/impl/NodeServiceImpl.java | 9 ++++++--- .../nodeuser/foundation/NodeUserFoundationService.java | 3 ++- .../foundation/impl/NodeUserFoundationServiceImpl.java | 3 ++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java index 2f37f5c..4138e21 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/node/service/impl/NodeServiceImpl.java @@ -7,6 +7,7 @@ import cn.axzo.orgmanax.dto.node.req.ListNodeReq; import cn.axzo.orgmanax.dto.node.req.ProcessNodeReq; import cn.axzo.orgmanax.dto.node.dto.OrgNodeDTO; import cn.axzo.orgmanax.common.config.BizResultCode; +import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO; import cn.axzo.orgmanax.infra.client.tyr.TyrSaasRoleUserClient; import cn.axzo.orgmanax.infra.client.tyr.dto.BatchSuperAdminListReq; import cn.axzo.orgmanax.infra.client.tyr.dto.BatchSuperAdminListResp; @@ -23,6 +24,7 @@ import cn.axzo.orgmanax.server.node.foundation.NodeFoundationService; import cn.axzo.orgmanax.server.node.service.NodeService; import cn.axzo.orgmanax.server.node.service.processor.NodeProcessor; import cn.axzo.orgmanax.server.nodeuser.foundation.NodeUserFoundationService; +import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.ListUtil; @@ -52,6 +54,7 @@ public class NodeServiceImpl implements NodeService { private final NodeUserFoundationService nodeUserFoundationService; private final CooperateShipQueryRepository cooperateShipQueryRepository; private final NodeFoundationService nodeFoundationService; + private final NodeUserService nodeUserService; @Override public NodeProcessor.ProcessResult process(ProcessNodeReq req) { @@ -98,7 +101,7 @@ public class NodeServiceImpl implements NodeService { // 获取部门用户信息, 若获取不到直接返回 if (Objects.nonNull(req.getPersonId())) { - List nodeUsers = nodeUserQueryRepository.list(ListNodeUserReq + List nodeUsers = nodeUserService.list(ListNodeUserReq .builder().personId(req.getPersonId()).build()); if (CollUtil.isEmpty(nodeUsers)) { return emptyPageResp; @@ -107,7 +110,7 @@ public class NodeServiceImpl implements NodeService { // 获取岗位信息 if (CollUtil.isNotEmpty(req.getJobCodes())) { List orgJobs = orgJobQueryRepository.list(OrgJobQueryRepository.ListReq.builder() - .ids(CollUtil.map(nodeUsers, OrganizationalNodeUser::getOrganizationalJobId, true)) + .ids(CollUtil.map(nodeUsers, NodeUserDTO::getOrganizationalJobId, true)) .codes(req.getJobCodes()) .build()); nodeUserFoundationService.filterByJobs(nodeUsers, orgJobs); @@ -116,7 +119,7 @@ public class NodeServiceImpl implements NodeService { if (CollUtil.isEmpty(nodeUsers)) { return emptyPageResp; } - reqListBuilder.ids(nodeUsers.stream().map(OrganizationalNodeUser::getOrganizationalNodeId).collect(Collectors.toSet())); + reqListBuilder.ids(nodeUsers.stream().map(NodeUserDTO::getOrganizationalNodeId).collect(Collectors.toSet())); } // 根据项目ID获取topNodeId进行组织节点过滤 diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java index 450e7f6..21d962c 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/NodeUserFoundationService.java @@ -1,5 +1,6 @@ package cn.axzo.orgmanax.server.nodeuser.foundation; +import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO; import cn.axzo.orgmanax.infra.dao.nodeuser.entity.OrganizationalNodeUser; import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository; import cn.axzo.orgmanax.infra.dao.orgjob.entity.OrgJob; @@ -33,5 +34,5 @@ public interface NodeUserFoundationService { * @param nodeUsers * @param orgJobs */ - void filterByJobs(List nodeUsers, List orgJobs); + void filterByJobs(List nodeUsers, List orgJobs); } diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java index 0bd70c4..ad024c8 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/nodeuser/foundation/impl/NodeUserFoundationServiceImpl.java @@ -4,6 +4,7 @@ import cn.axzo.foundation.event.support.Event; import cn.axzo.foundation.event.support.producer.EventProducer; import cn.axzo.foundation.exception.Axssert; import cn.axzo.orgmanax.common.config.BizResultCode; +import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO; import cn.axzo.orgmanax.dto.nodeuser.enums.NodeUserTypeEnum; import cn.axzo.orgmanax.infra.client.profile.PersonProfileGateway; import cn.axzo.orgmanax.infra.client.profile.dto.ProfileIdentityResp; @@ -135,7 +136,7 @@ public class NodeUserFoundationServiceImpl implements NodeUserFoundationService } @Override - public void filterByJobs(List nodeUsers, List orgJobs) { + public void filterByJobs(List nodeUsers, List orgJobs) { List jobIds = CollUtil.map(orgJobs, OrgJob::getId, true); nodeUsers.removeIf(e -> !jobIds.contains(e.getOrganizationalJobId())); }