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 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 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 allSequenceNumbers = new ArrayList<>(); for (ESSequenceNumberProvider provider : providers) { - allSequenceNumbers.addAll(provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue)); + List sequenceNumbers = provider.getSequenceNumbers(esCodeDictValue, esNameCodeDictValue, categoryCodeDictValue); + if (sequenceNumbers != null) { + allSequenceNumbers.addAll(sequenceNumbers); + } } // 转换为整数(只取整数部分)