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 { List getNodeMemberListByNodeIdList(@Param("nodeIdList") List nodeIdList); - List getOnlyNodeMemberListByNodeIdList(@Param("nodeIdList") List nodeIdList); + List getOnlyNodeMemberListByNodeIdList(@Param("nodeIdList") List nodeIdList,@Param("userType") Integer userType); List allList(@Param("nodeIdList") List 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 allNodeIdList = new ArrayList<>(); allNodeIdList.add(spdmNodeVo.getUuid()); recursionAllNodeIdList(Collections.singletonList(spdmNodeVo.getUuid()), allNodeIdList); - List spdmNodeMemberVoList = nodeMapper.getNodeMemberListByNodeIdList(allNodeIdList); + List spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(allNodeIdList,userType); if (CollectionUtils.isEmpty(spdmNodeMemberVoList)) { log.error("allNodeIdList:{},未查询到团队成员", allNodeIdList); jsonObject.put("data", new ArrayList()); @@ -5250,7 +5251,7 @@ public class NodeServiceImpl extends ServiceImpl spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(Collections.singletonList(projectId)); + List spdmNodeMemberVoList = nodeMapper.getOnlyNodeMemberListByNodeIdList(Collections.singletonList(projectId),NodeMemberTypeEnum.MANAGER.getCode()); List expUserIdList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(spdmNodeMemberVoList)) { List 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 @@ #{nodeId} - ) and type = 0 + ) + + and type = #{userType} + group by user_id, type,nodeId