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())); }