From e6e9335bc2044b771fa8f37877ae1c7a897f4128 Mon Sep 17 00:00:00 2001 From: lidongyang <506508008@qq.com> Date: Wed, 1 Apr 2026 17:59:56 +0800 Subject: [PATCH] =?UTF-8?q?fix[project]:=20=E5=8F=AA=E5=9C=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B9=E7=9B=AE=E4=B8=8B=E8=BF=9B=E8=A1=8C=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E9=9C=80=E6=B1=82=E5=90=8D=E6=98=AF=E5=90=A6=E5=90=8C?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/sdm/project/dao/SimulationDemandMapper.java | 2 +- .../sdm/project/service/impl/DemandServiceImpl.java | 2 +- .../sdm/project/service/impl/ProjectServiceImpl.java | 11 +++++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java index 029de855..a0809404 100644 --- a/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java +++ b/project/src/main/java/com/sdm/project/dao/SimulationDemandMapper.java @@ -35,7 +35,7 @@ public interface SimulationDemandMapper extends BaseMapper { SpdmDemandVo getDemandByName(@Param("tenantId") Long tenantId,@Param("demandName") String demandName,@Param("projectId") String projectId); - SpdmDemandVo getDemandByNameNoPermission(@Param("tenantId") Long tenantId,@Param("demandName") String demandName); + SpdmDemandVo getDemandByNameNoPermission(@Param("tenantId") Long tenantId,@Param("demandName") String demandName,@Param("projectId") String projectId); List getDemandExtraList(@Param("demandIdList") List demandIdList); diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java index 16a24144..fffdeca3 100644 --- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java @@ -1663,7 +1663,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService { String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); req.setCreateTime(curDateStr); req.setUuid(RandomUtil.generateString(32)); - SpdmDemandVo demandByName = mapper.getDemandByNameNoPermission(tenantId,req.getDemandName()); + SpdmDemandVo demandByName = mapper.getDemandByNameNoPermission(tenantId, req.getDemandName(),req.getProjectId()); if (ObjectUtils.isNotEmpty(demandByName)) { return SdmResponse.failed("需求名称：" + demandByName.getDemandName() + "已存在，请修改"); } diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java index 5239209a..70f0e5aa 100644 --- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java @@ -2645,10 +2645,13 @@ public class ProjectServiceImpl extends BaseService implements IProjectService { String curDateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); log.info("addDemandByTask taskNodeList为：{}",taskNodeList); for (TaskNode taskNode : taskNodeList) { - SpdmDemandVo demandByName = demandMapper.getDemandByNameNoPermission(tenantId,String.join(",", taskNode.getTag10())); - if (ObjectUtils.isNotEmpty(demandByName)) { - log.error("addDemandByTask 需求名称：{},已存在",demandByName.getDemandName()); - continue; + List projectIds = taskNode.getTag1(); + if (CollectionUtils.isNotEmpty(projectIds)) { + SpdmDemandVo demandByName = demandMapper.getDemandByNameNoPermission(tenantId,String.join(",", taskNode.getTag10()),projectIds.get(0)); + if (ObjectUtils.isNotEmpty(demandByName)) { + log.error("addDemandByTask 需求名称：{},已存在",demandByName.getDemandName()); + continue; + } } SpdmAddDemandReq req = new SpdmAddDemandReq(); req.setCreator(jobNumber);