From f7afc156a2325d7903bf981373e19b197d419c10 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 24 Nov 2023 10:31:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=94=9F=E6=88=90=E6=96=B0=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E7=BC=96=E5=8F=B7=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java         | 1 +
 .../service/impl/EnterpriseStandardPlanServiceImpl.java      | 1 +
 .../modules/laws/enterprise/util/EnterpriseStandardUtil.java | 5 ++++-
 3 files changed, 6 insertions(+), 1 deletion(-)

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 785c7130..442701f7 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
@@ -248,6 +248,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         lambdaQueryWrapper.eq(ProcessEsInitChange::getEnStandardCode, esCodeDictValue);
         lambdaQueryWrapper.eq(ProcessEsInitChange::getEnNameCode, esNameCodeDictValue);
         lambdaQueryWrapper.eq(ProcessEsInitChange::getStandardCategoryCode, categoryCodeDictValue);
+        lambdaQueryWrapper.isNotNull(ProcessEsInitChange::getNewEnStandardNo);
         List<ProcessEsInitChange> list = this.list(lambdaQueryWrapper);
 
         return list.stream().map(ProcessEsInitChange::getNewEnStandardNo)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
index b2ec8529..09641f8c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardPlanServiceImpl.java
@@ -125,6 +125,7 @@ public class EnterpriseStandardPlanServiceImpl extends ServiceImpl<EnterpriseSta
         lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnStandardCode, esCodeDictValue);
         lambdaQueryWrapper.eq(EnterpriseStandardPlan::getEnNameCode, esNameCodeDictValue);
         lambdaQueryWrapper.eq(EnterpriseStandardPlan::getStandardCategoryCode, categoryCodeDictValue);
+        lambdaQueryWrapper.isNotNull(EnterpriseStandardPlan::getNewEnStandardNo);
         List<EnterpriseStandardPlan> espList = this.list(lambdaQueryWrapper);
 
         return espList.stream().map(EnterpriseStandardPlan::getNewEnStandardNo)
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
index 2a3135fa..76b34c56 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java
@@ -54,7 +54,10 @@ public class EnterpriseStandardUtil {
         List<String> allSequenceNumbers = new ArrayList<>();
 
         for (ESSequenceNumberProvider provider : providers) {
-            allSequenceNumbers.addAll(provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue));
+            List<String> sequenceNumbers = provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue);
+            if (sequenceNumbers != null) {
+                allSequenceNumbers.addAll(sequenceNumbers);
+            }
         }
 
         // 转换为整数（只取整数部分）