From b007aa495a3007c4e956ec66db4851281c7c6e9e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 26 Jan 2024 10:33:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=B8=AD=E6=AD=A2=E9=80=89=E6=8B=A9=E6=9C=AA?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=9A=84=E8=AE=A1=E5=88=92=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 74559193..ff04bf64 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
@@ -375,6 +375,15 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
             }
             // 如果是变更流程，则需要撤回制修订流程
             List<String> espIdList = initChangeData.getDataList().stream().map(ProcessEsInitChange::getEspId).collect(Collectors.toList());
+            // 未开始的企标计划不需要强制撤回
+            espService.listByIds(espIdList).forEach(esp -> {
+                if (esp.getProjectStatus().equals(ESPProjectStatus.NOT_STARTED.getValue())) {
+                    espIdList.remove(esp.getId());
+                }
+            });
+            if (espIdList.isEmpty()) {
+                return;
+            }
             LambdaQueryWrapper<ProcessEsRevision> lambdaQueryWrapper = new LambdaQueryWrapper<>();
             lambdaQueryWrapper.in(ProcessEsRevision::getEspId, espIdList);
             lambdaQueryWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());