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);