From fbe92e9bbfbd2f0d0723bcbcfb6d715b4d07c3e7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 23 Feb 2024 16:04:16 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081992=20=E5=B9=B4=E5=BA=A6=E5=88=B6?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=EF=BC=88=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8C=96=E5=BD=92=E6=A1=A3=EF=BC=89=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=98=BB=E5=A1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/ProcessESAnnualInitEndListener.java | 8 +++++--- .../listener/ProcessESAnnualReportEndListener.java | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) 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) {