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 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 lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.in(ProcessEsRevision::getEspId, espIdList); lambdaQueryWrapper.eq(ProcessEsRevision::getDelFlag, YesOrNoEnum.NO.getValue());