From 0f5c90197987f7ba110010d0202df3921bc0cffb Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 26 Jan 2024 13:37:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=90=88=E5=B9=B6=20=E5=8F=91=E8=B5=B7=E6=A0=A1=E9=AA=8CBUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java     | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 4c3d87da..f1ea168c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -364,8 +364,15 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 校验企标编号是否冲突
         ProcessEsInitChange initChange = esInitChangeList.get(0);
         if (ESPApplicationCategoryEnum.CHANGE.getValue().equals(initChange.getApplicationCategory())) {
+            Set<String> espIdSet = new HashSet<>();
             // 如果是变更流程，则需要判断计划是否有效
-            Set<String> espIdSet = esInitChangeList.stream().map(ProcessEsInitChange::getEspId).collect(Collectors.toSet());
+            if (ESPProjectType.MERGE.getValue().equals(initChange.getProjectType())) {
+                // 如果是合并流程，需要判断计划是否已经逾期
+                espIdSet.add(initChange.getStandardIdOne());
+                espIdSet.add(initChange.getStandardIdTwo());
+            } else {
+                espIdSet = esInitChangeList.stream().map(ProcessEsInitChange::getEspId).collect(Collectors.toSet());
+            }
             List<EnterpriseStandardPlan> esplist = espService.list(new LambdaQueryWrapper<EnterpriseStandardPlan>().in(EnterpriseStandardPlan::getId, espIdSet));
             if (esplist == null || esplist.size() != espIdSet.size()) {
                 throw new JeroBootException(ResultCommon.INVALID_ESP);