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 espIdSet = new HashSet<>(); // 如果是变更流程,则需要判断计划是否有效 - Set 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 esplist = espService.list(new LambdaQueryWrapper().in(EnterpriseStandardPlan::getId, espIdSet)); if (esplist == null || esplist.size() != espIdSet.size()) { throw new JeroBootException(ResultCommon.INVALID_ESP);