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 c00f4dab..aa3d7832 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 @@ -95,9 +95,11 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener { needValidList.add(esp); } } - List duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); - if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { - throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); + if (!needValidList.isEmpty()) { + List duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); + if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { + throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); + } } // 判断修订的新标准号是否有效 for (EnterpriseStandardPlan esp : enterpriseStandardPlans) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java index c4e4f80c..dddb6010 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java @@ -80,9 +80,11 @@ public class ProcessESAnnualReportEndListener implements ExecutionListener { needValidList.add(esp); } } - List duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); - if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { - throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); + if (!needValidList.isEmpty()) { + List duplicateStandardNumbers = esUtil.verifyEsNumberByPlans(needValidList); + if (duplicateStandardNumbers != null && !duplicateStandardNumbers.isEmpty()) { + throw new JeroBootException("原企标编号" + String.join(",", duplicateStandardNumbers) + "修订后,与已存在的企标编号重复,请删除后重新提交"); + } } // 判断修订的新标准号是否有效 for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {