From c9a1b705df371590f3a68f9ad38f6db630760504 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 2 Aug 2024 16:36:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088041=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=20=E7=9B=91=E5=AF=9F=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E5=A1=AB=E5=86=99=E9=94=99=E8=AF=AF=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E9=9C=80=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/common/service/impl/LawsCommonServiceImpl.java       | 2 +-
 .../java/com/jero/modules/laws/common/util/ImportUtil.java    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index da4471ca..087beb9c 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1811,7 +1811,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             // 如果是企标的话手动添加稽查内容字段
             if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) {
                 LawsTag inspectContentTag = new LawsTag();
-                inspectContentTag.setDbFieldTxt("稽查内容");
+                inspectContentTag.setDbFieldTxt("监察内容");
                 inspectContentTag.setFieldShowType(FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue());
                 inspectContentTag.setDbFieldName(FieldCommon.CHECK_LIST);
                 inspectContentTag.setFieldMustInput(YesOrNoEnum.NO.getValue());
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 e04db7d9..24089673 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
@@ -184,7 +184,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{3}-\\d{4}$")) {
+                        if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2,} [A-Z]\\d?-\\d+-\\d{3}-\\d{4}$")) {
                             log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "格式不正确 ");
                             errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("格式不正确 ");
                         } else {
@@ -398,6 +398,8 @@ public class ImportUtil {
                     String nodeId = treeNodePathMap.get(value);
                     return StrUtil.isNotBlank(nodeId);
                 }
+            } else {
+                return false;
             }
         }
         return true;