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

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<NodeUserQueryRepository.NodeUserResp> nodeUsers = nodeUserQueryRepository.list(ListNodeUserReq
+            List<NodeUserDTO> 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<OrgJobQueryRepository.JobResp> 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进行组织节点过滤

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
      */
-    <T extends OrganizationalNodeUser, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs);
+    <T extends NodeUserDTO, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs);
 }

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 <T extends OrganizationalNodeUser, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs) {
+    public <T extends NodeUserDTO, Job extends OrgJob> void filterByJobs(List<T> nodeUsers, List<Job> orgJobs) {
         List<Long> jobIds = CollUtil.map(orgJobs, OrgJob::getId, true);
         nodeUsers.removeIf(e -> !jobIds.contains(e.getOrganizationalJobId()));
     }