From 33602292234b6df1d74f3e45fe087049d2aedb78 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 20 Aug 2024 17:20:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2089115=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=20=E9=A1=BA=E5=BA=8F=E5=8F=B7?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=9D=9E=E6=95=B0=E5=AD=97=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/laws/common/util/ImportUtil.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 985b4511..dc17c201 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -187,7 +187,7 @@ public class ImportUtil {
                 if (FieldCommon.STANDARD_NUMBER.equals(tag.getDbFieldName())) {
                     if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(tag.getIsModel())) {
                         // 使用正则表达式进行基础的格式验证
-                        if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d?-\\d+-\\d{4}$")) {
+                        if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d?-\\S*-\\d{4}$")) {
                             log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 ");
                             errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 ");
                         } else {