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()); }