From f69c8b41b051c598661b9b2d2d73dc9da22a8905 Mon Sep 17 00:00:00 2001 From: liuyang Date: Tue, 24 Dec 2024 15:10:43 +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 --- .../impl/CooperateShipFoundationServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java index 73da16c..2d8533a 100644 --- a/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java +++ b/orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java @@ -1,9 +1,11 @@ package cn.axzo.orgmanax.server.cooperateship.foundation.impl; +import cn.axzo.orgmanax.dto.nodeuser.dto.NodeUserDTO; import cn.axzo.orgmanax.dto.nodeuser.req.ListNodeUserReq; import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip; import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository; import cn.axzo.orgmanax.server.cooperateship.foundation.CooperateShipFoundationService; +import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService; import cn.hutool.core.util.StrUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,7 +20,7 @@ import java.util.stream.Collectors; public class CooperateShipFoundationServiceImpl implements CooperateShipFoundationService { - private final NodeUserQueryRepository nodeUserQueryRepository; + private final NodeUserService nodeUserService; @Override public void filterByPerson(Long filterPersonId, List list) { @@ -27,11 +29,11 @@ public class CooperateShipFoundationServiceImpl implements CooperateShipFoundati return; } Set organizationalNodeIds = list.stream().map(SaasCooperateShip::getOrganizationalNodeId).collect(Collectors.toSet()); - Set personInNodeIds = nodeUserQueryRepository.list(ListNodeUserReq.builder() + Set personInNodeIds = nodeUserService.list(ListNodeUserReq.builder() .personId(filterPersonId) .organizationalNodeIds(organizationalNodeIds) .build()) - .stream().map(NodeUserQueryRepository.NodeUserResp::getTopNodeId).collect(Collectors.toSet()); + .stream().map(NodeUserDTO::getTopNodeId).collect(Collectors.toSet()); list.removeIf(t -> !personInNodeIds.contains(t.getOrganizationalNodeId())); }