From 7c54be67eaebd004fab30e418061f118f1e05c68 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 5 Jan 2024 16:06:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E7=94=9F=E6=88=90BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/enterprise/util/EnterpriseStandardUtil.java       | 7 +++++++
 1 file changed, 7 insertions(+)

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 826c32e0..887689d2 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
@@ -8,7 +8,9 @@ import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange
 import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.common.api.vo.ResultCommon;
+import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +44,9 @@ public class EnterpriseStandardUtil {
     @Resource
     private ProcessEsInitChangeService initChangeService;
 
+    @Resource
+    private EnterpriseStandardPlanService espService;
+
     /**
      * 生成新序列号
      *
@@ -251,6 +256,8 @@ public class EnterpriseStandardUtil {
         List<String> numList = new ArrayList<>();
         // 判断是否和企标库中重复
         numList.addAll(esService.list().stream().map(LawsEnterpriseStandard::getStandardNumber).collect(Collectors.toList()));
+        // 判断是否和企标计划库中重复
+        numList.addAll(espService.list().stream().map(EnterpriseStandardPlan::getNewEnStandardNo).collect(Collectors.toList()));
         // 判断是否和立项流程中重复
         numList.addAll(initChangeService.list().stream().map(ProcessEsInitChange::getNewEnStandardNo).collect(Collectors.toList()));
         return !numList.contains(StandardNumber);