diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java index 650e091f..54cd096a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java @@ -53,9 +53,6 @@ public class ProcessESRevisionEndListener implements ExecutionListener { @Resource private ILawsCommonService lawsCommonService; - @Resource - private ILawsEnterpriseStandardService esService; - @Override public void notify(DelegateExecution delegateExecution) { // 获取流程实例Id @@ -87,19 +84,17 @@ public class ProcessESRevisionEndListener implements ExecutionListener { } // 标准状态 String tryFlag = (String) variables.get(FieldCommon.TRY_FLAG); - if (tryFlag.equals(YesOrNoEnum.YES.getValue())) { - variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); - } else { - variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); + if (tryFlag != null) { + if (tryFlag.equals(YesOrNoEnum.YES.getValue())) { + variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.TRIAL_OPERATION.getStateValue()); + } } + variables.put(FieldCommon.STANDARD_STATE, StandardStateEnum.RELEASE.getStateValue()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); // 发布企标 lawsCommonService.commonAdd(variables); String espId = data.getEspId(); EnterpriseStandardPlan esp = espService.getById(espId); - LambdaQueryWrapper esWrapper = new LambdaQueryWrapper<>(); - esWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber); - LawsEnterpriseStandard es = esService.getOne(esWrapper); // 保存评审会记录 EnterpriseStandardReviewMeetingRecord esRmr = new EnterpriseStandardReviewMeetingRecord(); esRmr.setStandardId(esp.getId());