From 2a6870fa92b64da948f29d53529a9b5db1d2c17c Mon Sep 17 00:00:00 2001
From: shil <452061493@qq.com>
Date: Wed, 23 Apr 2025 09:16:38 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E7=99=BB=E8=AE=B0=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E4=B8=80=E4=B8=AA=E8=81=94=E7=B3=BB=E4=BA=BA=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E4=BA=86=E5=A4=9A=E4=B8=AA=E4=BC=81=E4=B8=9A=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=8F=AA?=
 =?UTF-8?q?=E5=8F=96=E7=AC=AC=E4=B8=80=E4=B8=AA=E4=BF=9D=E5=AD=98=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=20=E5=81=87=E5=A6=82=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=EF=BC=8C=20=E4=BC=81=E4=B8=9A=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=BA=E7=A9=BA=E7=9A=84=E8=AF=9D=E5=88=99=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E7=94=A8=E4=BC=81=E4=B8=9A=E7=BC=96=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EnterpriseLawEnforcementServiceImpl.java  | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

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 2a4e8f2a..799b19b9 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
@@ -206,17 +206,22 @@ public class EnterpriseLawEnforcementServiceImpl implements IEnterpriseLawEnforc
             //预约记录，默认正常
             enterpriseLawEnforcement.setStatus(0);
 //            enterpriseLawEnforcement.setIsSubmit(0);
-            EnterpriseMerchantAuthorization enterpriseMerchantAuthorization =
-                    new EnterpriseMerchantAuthorization();
-            //联系人手机号码
-            enterpriseMerchantAuthorization.setMerchantTel(enterpriseLawEnforcement.getLinkTel());
-            //查询企业信息
-            List<EnterpriseMerchantAuthorization> enterpriseMerchantAuthorizations =
-                    enterpriseMerchantAuthorizationService.selectEnterpriseMerchantAuthorizationList(enterpriseMerchantAuthorization);
-            if (enterpriseMerchantAuthorizations.size() > 0) {
-                //设置企业的统一信用代码
-                enterpriseLawEnforcement.setEnterpriseNumber(
-                        enterpriseMerchantAuthorizations.get(0).getEnterpriseNumber());
+            if (StringUtils.isNotEmpty(enterpriseLawEnforcement.getEnterpriseNumber())) {
+                // 改为直接用企业编码 - 如果企业编码重复一样会出现问题（再登记的时候会查出不通企业， 不过问题不大）
+                enterpriseLawEnforcement.setEnterpriseNumber(enterpriseLawEnforcement.getEnterpriseNumber());
+            } else {
+                EnterpriseMerchantAuthorization enterpriseMerchantAuthorization =
+                        new EnterpriseMerchantAuthorization();
+                // 联系人手机号码 - 通过联系人的话会出现问题， 比如一个联系人有多个企业， 只去第一个会导致数据错误
+                enterpriseMerchantAuthorization.setMerchantTel(enterpriseLawEnforcement.getLinkTel());
+                //查询企业信息
+                List<EnterpriseMerchantAuthorization> enterpriseMerchantAuthorizations =
+                        enterpriseMerchantAuthorizationService.selectEnterpriseMerchantAuthorizationList(enterpriseMerchantAuthorization);
+                if (enterpriseMerchantAuthorizations.size() > 0) {
+                    //设置企业的统一信用代码
+                    enterpriseLawEnforcement.setEnterpriseNumber(
+                            enterpriseMerchantAuthorizations.get(0).getEnterpriseNumber());
+                }
             }
             resNum = enterpriseLawEnforcementMapper.insertEnterpriseLawEnforcement(enterpriseLawEnforcement);
         }