From 34ee3af195d18d3cb1f6b6d27cc3a35a1b7805cb Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Sun, 2 Jun 2024 23:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=89=A7=E6=B3=95=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EnforcementRegistrationServiceImpl.java | 9 ++++++---
 .../impl/EnterpriseLawEnforcementServiceImpl.java        | 6 ++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
index 6324417f..8e4e9f81 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnforcementRegistrationServiceImpl.java
@@ -71,17 +71,20 @@ public class EnforcementRegistrationServiceImpl implements IEnforcementRegistrat
         if(enforcementRegistration.getLawEnforcerId() != null){
             UserBean user =
                     userApi.getUserByUserId(enforcementRegistration.getLawEnforcerId());
-            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer() + " " + user.getLawCertificateNum() );
+//            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setLawEnforcer(enforcementRegistration.getLawEnforcer());
         }
         if(enforcementRegistration.getLawEnforcerIdTwo() != null){
             UserBean user =
                     userApi.getUserByUserId(enforcementRegistration.getLawEnforcerIdTwo());
-            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
+//            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setLawEnforcerTwo(enforcementRegistration.getLawEnforcerTwo());
         }
         if(enforcementRegistration.getSubsidiaryerId() != null){
             UserBean user =
                     userApi.getUserByUserId(enforcementRegistration.getSubsidiaryerId());
-            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() );
+//            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer() + " " + user.getLawCertificateNum() );
+            enforcementRegistration.setSubsidiaryer(enforcementRegistration.getSubsidiaryer());
         }
         if(StrUtil.isNotEmpty(enforcementRegistration.getLawEnforcementItem())) {
             LinkageDict linkageDict = linkageDictMapper.selectLinkageDictById(enforcementRegistration.getLawEnforcementItem());
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
index 9b2f18c6..b670848e 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/EnterpriseLawEnforcementServiceImpl.java
@@ -60,12 +60,14 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
         if(enterpriseLawEnforcement.getLawEnforcerId() != null){
             UserBean user =
                     userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerId()));
-            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer() + " " + user.getLawCertificateNum() );
+//            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer() + " " + user.getLawCertificateNum() );
+            enterpriseLawEnforcement.setLawEnforcer(enterpriseLawEnforcement.getLawEnforcer());
         }
         if(StrUtil.isNotEmpty(enterpriseLawEnforcement.getLawEnforcerTwoId())){
             UserBean user =
                     userApi.getUserByUserId(Long.valueOf(enterpriseLawEnforcement.getLawEnforcerTwoId()));
-            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
+//            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo() + " " + user.getLawCertificateNum() );
+            enterpriseLawEnforcement.setLawEnforcerTwo(enterpriseLawEnforcement.getLawEnforcerTwo());
         }
         if(StrUtil.isNotEmpty(enterpriseLawEnforcement.getCheckItem())){
             LinkageDict linkageDict = linkageDictService.selectLinkageDictById(enterpriseLawEnforcement.getCheckItem());