From f410b16c5c204908bdb884ecb36048d7a7e2bc5b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 22 Feb 2024 13:45:26 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081952=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E5=8F=98=E6=9B=B4--=E5=90=88=E5=B9=B6--=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=A0=A1=E9=AA=8C=E6=96=B0=E4=BC=81=E4=B8=9A=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E5=94=AF=E4=B8=80=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsInitChangeServiceImpl.java         | 5 +++++
 1 file changed, 5 insertions(+)

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 cca73095..d3462dac 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
@@ -365,6 +365,11 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
                 throw new JeroBootException(ResultCommon.EN_STANDARD_NUMBER_CONFLICT);
             }
         }
+        if (initChange.getProjectType().equals(ESPProjectType.MERGE.getValue())) {
+            if (!esUtil.verifyEnStandardNumber(initChange.getNewEnStandardNo())) {
+                throw new JeroBootException(ResultCommon.EN_STANDARD_NUMBER_CONFLICT);
+            }
+        }
     }
 
     public void startRunTask(InitChangeDataVO initChangeData) {