From 6a70d5498a2f7491b0e6095afb6c2398d2a17587 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Wed, 27 Aug 2025 13:45:33 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E4=BF=AE=E6=94=B9=E3=80=81=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9=E3=80=81=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=94=AF=E6=8C=81=E6=96=B0=E5=A2=9E=E4=BC=81=E4=B8=9A?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0/=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
 =?UTF-8?q?=E3=80=82=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0/?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E6=9F=A5=E8=AF=A2=E3=80=82?=
 =?UTF-8?q?=20=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=A2=9E=E5=8A=A0=E4=BC=81=E4=B8=9A=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0/=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7=E3=80=82=20?=
 =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=BD=95=E5=85=A5=E9=80=89=E6=8B=A9=E6=9C=88?=
 =?UTF-8?q?=E7=BB=93=E5=AE=A2=E6=88=B7=E8=87=AA=E5=8A=A8=E5=85=B3=E8=81=94?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=9C=88=E7=BB=93=E5=AE=A2=E6=88=B7=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0/?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=A8=8E=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../web/emis/EmisCustomerUserController.java  | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
index 2a1c729d2..08b4ada3c 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCustomerUserController.java
@@ -245,15 +245,7 @@ public class EmisCustomerUserController extends EmisBaseController
         try {
             // 验证企业名称和企业税号
             try {
-                // 验证企业名称格式
-                if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) {
-                    throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号");
-                }
-
-                // 验证企业税号格式
-                if (!emisBaseService.validateEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId())) {
-                    throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号");
-                }
+                checkEnterprise(emisCustomerUser);
             } catch (Exception e) {
                 return AjaxResult.error(e.getMessage());
             }
@@ -286,6 +278,21 @@ public class EmisCustomerUserController extends EmisBaseController
 
     }
 
+    private void checkEnterprise(EmisCustomerUser emisCustomerUser) throws EmisBizError {
+        if (!"0086".equals(emisCustomerUser.getCountry())) {
+            return;
+        }
+        // 验证企业名称格式
+        if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) {
+            throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号");
+        }
+
+        // 验证企业税号格式
+        if (!emisBaseService.validateEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId())) {
+            throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号");
+        }
+    }
+
     private void nameToCode(EmisCustomerUser emisCustomerUser) {
         // 国家
         if (!StringUtils.isEmpty(emisCustomerUser.getCountry())) {
@@ -363,14 +370,7 @@ public class EmisCustomerUserController extends EmisBaseController
             // 验证企业名称和企业税号
             try {
                 // 验证企业名称格式
-                if (!emisBaseService.validateEnterpriseName(emisCustomerUser.getEnterpriseName())) {
-                    throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业名称不能包含空格、回车、@、#、$、%、&、数字等特殊符号");
-                }
-
-                // 验证企业税号格式
-                if (!emisBaseService.validateEnterpriseTaxId(emisCustomerUser.getEnterpriseTaxId())) {
-                    throw new EmisBizError(EmisBizErrorType.PARAM_ERROR, "企业税号必须为8-18位数字和大写字母组成，不能包含汉字、空格等特殊符号");
-                }
+                checkEnterprise(emisCustomerUser);
             } catch (Exception e) {
                 return AjaxResult.error(e.getMessage());
             }