wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:[REQ-3282] 解决代码冲突问题

Browse Source
This commit is contained in:
liuyang 2024-12-24 15:10:43 +08:00
parent 32b2e701c7
commit f69c8b41b0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orgmanax-server/src/main/java/cn/axzo/orgmanax/server/cooperateship/foundation/impl/CooperateShipFoundationServiceImpl.java
View File

@ -1,9 +1,11 @@
package cn.axzo.orgmanax.server.cooperateship.foundation.impl; 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.dto.nodeuser.req.ListNodeUserReq;
import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip; import cn.axzo.orgmanax.infra.dao.cooperateship.entity.SaasCooperateShip;
import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository; import cn.axzo.orgmanax.infra.dao.nodeuser.repository.NodeUserQueryRepository;
import cn.axzo.orgmanax.server.cooperateship.foundation.CooperateShipFoundationService; import cn.axzo.orgmanax.server.cooperateship.foundation.CooperateShipFoundationService;
import cn.axzo.orgmanax.server.nodeuser.service.NodeUserService;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -18,7 +20,7 @@ import java.util.stream.Collectors;
public class CooperateShipFoundationServiceImpl implements CooperateShipFoundationService { public class CooperateShipFoundationServiceImpl implements CooperateShipFoundationService {
private final NodeUserQueryRepository nodeUserQueryRepository; private final NodeUserService nodeUserService;
@Override @Override
public void filterByPerson(Long filterPersonId, List<SaasCooperateShip> list) { public void filterByPerson(Long filterPersonId, List<SaasCooperateShip> list) {
@ -27,11 +29,11 @@ public class CooperateShipFoundationServiceImpl implements CooperateShipFoundati
return; return;
} }
Set<Long> organizationalNodeIds = list.stream().map(SaasCooperateShip::getOrganizationalNodeId).collect(Collectors.toSet()); Set<Long> organizationalNodeIds = list.stream().map(SaasCooperateShip::getOrganizationalNodeId).collect(Collectors.toSet());
Set<Long> personInNodeIds = nodeUserQueryRepository.list(ListNodeUserReq.builder() Set<Long> personInNodeIds = nodeUserService.list(ListNodeUserReq.builder()
.personId(filterPersonId) .personId(filterPersonId)
.organizationalNodeIds(organizationalNodeIds) .organizationalNodeIds(organizationalNodeIds)
.build()) .build())
.stream().map(NodeUserQueryRepository.NodeUserResp::getTopNodeId).collect(Collectors.toSet()); .stream().map(NodeUserDTO::getTopNodeId).collect(Collectors.toSet());
list.removeIf(t -> !personInNodeIds.contains(t.getOrganizationalNodeId())); list.removeIf(t -> !personInNodeIds.contains(t.getOrganizationalNodeId()));
} }