diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java index 93df48f4..da33367c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java @@ -9,7 +9,6 @@ import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionTy import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision; import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO; import com.jero.modules.activiti.process.esRevision.service.EsRevisionService; -import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan; import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService; @@ -43,9 +42,6 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener { @Resource private EnterpriseStandardUtil esUtil; - @Resource - private ProcessAllService processAllService; - /** * 流程结束之后需要把数据存入企标计划数据库 * @@ -59,6 +55,7 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener { // 根据流程实例Id找到所有流程业务数据 LambdaQueryWrapper esAnnualInitWrapper = new LambdaQueryWrapper<>(); esAnnualInitWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId); + esAnnualInitWrapper.eq(ProcessEsAnnualInit::getExecutionId, delegateExecution.getId()); List annualInits = annualInitService.list(esAnnualInitWrapper); if (annualInits == null || annualInits.isEmpty()) { log.info("年度制修订标准化发起流程结束 监听执行器未找到流程业务数据"); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java index e317f77f..4773f61d 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java @@ -271,6 +271,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl idList = dataList.stream().map(ProcessEsAnnualInit::getId).collect(Collectors.toList()); + wrapper.in(ProcessEsAnnualInit::getId, idList); remove(wrapper); saveBatch(dataList); break;