From 9be0f1a320b09c452b58e28a7efe4fd52e2e3701 Mon Sep 17 00:00:00 2001
From: lidongyang <506508008@qq.com>
Date: Fri, 17 Apr 2026 15:33:45 +0800
Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E6=9F=A5=E8=AF=A2=E5=9B=A2?=
 =?UTF-8?q?=E9=98=9F=E6=88=90=E5=91=98=E6=97=B6=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sdm/project/dao/SimulationNodeMapper.java     | 2 +-
 .../java/com/sdm/project/model/req/GetProjectListReq.java  | 7 +++++++
 .../java/com/sdm/project/service/impl/NodeServiceImpl.java | 5 +++--
 project/src/main/resources/mapper/SimulationNodeMapper.xml | 5 ++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
index a54aea1b..ea3ae4ae 100644
--- a/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
+++ b/project/src/main/java/com/sdm/project/dao/SimulationNodeMapper.java
@@ -62,7 +62,7 @@ public interface SimulationNodeMapper extends BaseMapper<SimulationNode> {
 
     List<SpdmNodeMemberVo> getNodeMemberListByNodeIdList(@Param("nodeIdList") List<String> nodeIdList);
 
-    List<SpdmNodeMemberVo> getOnlyNodeMemberListByNodeIdList(@Param("nodeIdList") List<String> nodeIdList);
+    List<SpdmNodeMemberVo> getOnlyNodeMemberListByNodeIdList(@Param("nodeIdList") List<String> nodeIdList,@Param("userType") Integer userType);
 
     List<ProjectNodePo> allList(@Param("nodeIdList") List<String> deleteNodeList);
 
diff --git a/project/src/main/java/com/sdm/project/model/req/GetProjectListReq.java b/project/src/main/java/com/sdm/project/model/req/GetProjectListReq.java
index 68c1447d..f7a0a21c 100644
--- a/project/src/main/java/com/sdm/project/model/req/GetProjectListReq.java
+++ b/project/src/main/java/com/sdm/project/model/req/GetProjectListReq.java
@@ -1,5 +1,6 @@
 package com.sdm.project.model.req;
 
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
@@ -16,4 +17,10 @@ public class GetProjectListReq {
 
     private String phaseNodeId;
 
+    /**
+     * 用户类型，0：团队成员，3：项目参与人员
+     */
+    @Schema(description = "用户类型，0：团队成员，3：项目参与人员")
+    private Integer userType = 0;
+
 }
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index ef48800f..90f2137d 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -2026,6 +2026,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         Long tenantId = ThreadLocalContext.getTenantId();
         JSONObject jsonObject = new JSONObject();
         String projectNodeId = req.getProjectNodeId();
+        Integer userType = req.getUserType();
         SpdmNodeVo spdmNodeVo = nodeMapper.getNodeById(projectNodeId);
         if (ObjectUtils.isEmpty(spdmNodeVo)) {
             log.error("根据projectNodeId：{}，未查询到团队成员", projectNodeId);
@@ -2035,7 +2036,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         List<String> allNodeIdList = new ArrayList<>();
         allNodeIdList.add(spdmNodeVo.getUuid());
         recursionAllNodeIdList(Collections.singletonList(spdmNodeVo.getUuid()), allNodeIdList);
-        List<SpdmNodeMemberVo> spdmNodeMemberVoList = nodeMapper.getNodeMemberListByNodeIdList(allNodeIdList);
+        List<SpdmNodeMemberVo> spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(allNodeIdList,userType);
         if (CollectionUtils.isEmpty(spdmNodeMemberVoList)) {
             log.error("allNodeIdList：{}，未查询到团队成员", allNodeIdList);
             jsonObject.put("data", new ArrayList<CIDUserResp>());
@@ -5250,7 +5251,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
             return SdmResponse.failed("参数不能为空");
         }
         // 查询当前项目的团队成员，如果是团队成员，则不允许添加
-        List<SpdmNodeMemberVo> spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(Collections.singletonList(projectId));
+        List<SpdmNodeMemberVo> spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(Collections.singletonList(projectId),NodeMemberTypeEnum.MANAGER.getCode());
         List<Long> expUserIdList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(spdmNodeMemberVoList)) {
             List<Long> existUserIdList = spdmNodeMemberVoList.stream().map(SpdmNodeMemberVo::getUserId).toList();
diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml
index 6c2fd9e5..2a39e90f 100644
--- a/project/src/main/resources/mapper/SimulationNodeMapper.xml
+++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml
@@ -401,7 +401,10 @@
         <foreach collection='nodeIdList' item='nodeId' index='index' separator=','>
             #{nodeId}
         </foreach>
-        ) and type = 0
+        )
+        <if test="userType != null and userType !='' ">
+            and type = #{userType}
+        </if>
         group by user_id, type,nodeId
     </select>