From b40eabe610f2d2478cc384c6f037de03fafec645 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 27 Sep 2024 11:07:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EsRevisionServiceImpl.java       | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
index 9d2a561e..a7ac48eb 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevisionAdvice/service/impl/EsRevisionServiceImpl.java
@@ -88,6 +88,9 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
     @Resource
     private ILawsEnterpriseStandardService esService;
 
+    @Resource
+    private EnterpriseStandardPlanService planService;
+
     @Override
     public void startProcess(ProcessInfoVO<ProcessRevisionVO> processInfoVO) {
         // 流程Key
@@ -264,9 +267,15 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
                 Map<String, Object> variables = JSON.parseObject(data.getBusinessJson(), Map.class);
                 String standardNumber = (String) variables.get(FieldCommon.STANDARD_NUMBER);
                 LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
-                queryWrapper.eq(LawsEnterpriseStandard::getStandardNumber, variables.get(FieldCommon.STANDARD_NUMBER));
-                LawsEnterpriseStandard one = esService.getOne(queryWrapper);
-                if (Objects.nonNull(one)) {
+                queryWrapper.eq(LawsEnterpriseStandard::getStandardNumber, standardNumber);
+                LawsEnterpriseStandard es = esService.getOne(queryWrapper);
+                if (Objects.nonNull(es)) {
+                    throw new JeroBootException(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS);
+                }
+                LambdaQueryWrapper<EnterpriseStandardPlan> planQueryWrapper = new LambdaQueryWrapper<>();
+                planQueryWrapper.eq(EnterpriseStandardPlan::getStandardNumber, standardNumber);
+                EnterpriseStandardPlan plan = planService.getOne(planQueryWrapper);
+                if (Objects.nonNull(plan)) {
                     throw new JeroBootException(ResultCommon.STANDARD_NUMBER_ALREADY_EXISTS);
                 }
                 // 保存数据