From 56486d9d84d653667e595d197bd140763c396239 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 16 Aug 2024 16:59:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088604=20=E5=A4=96=E6=9D=A5=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9E=81=E9=99=90=E5=80=BC=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b545bf021591cb26ee293ae4c18e6135c9087667)
---
 .../modules/laws/common/util/ImportUtil.java  | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

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 c0fa5b52..bcd39c57 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
@@ -135,32 +135,27 @@ public class ImportUtil {
                         // 校验标准号
                         if (StrUtil.isNotBlank(standardNumberTemp) && StrUtil.isNotBlank(yearNumber)) {
                             if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()))) {
-                                if (!yearNumber.equals("BLANK") && !this.yearValid(yearNumber)) {
-                                    log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
-                                    errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
+                                String domesticStandardNumber = standardNumberTemp;
+                                if (!yearNumber.equals("BLANK")) {
+                                    domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
+                                    parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
+                                }
+                                QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
+                                domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
+                                domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
+                                LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper);
+                                standardValidFlag = true;
+                                if (lawsDomesticStandard != null) {
+                                    log.error("第" + line + "行的标准编号已存在 ");
+                                    errMsg.append("拼接后的标准编号已存在于库中");
+                                    break;
+                                }
+                                // 判断是否有重复数据
+                                if (keyMap.containsKey(domesticStandardNumber)) {
+                                    errMsgList.add("第" + keyMap.get(domesticStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
                                 } else {
-                                    String domesticStandardNumber = standardNumberTemp;
-                                    if (!yearNumber.equals("BLANK")) {
-                                        domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
-                                        parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
-                                    }
-                                    QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
-                                    domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
-                                    domesticStandardQueryWrapper.eq(FieldCommon.DEL_FLAG, YesOrNoEnum.NO.getValue());
-                                    LawsDomesticStandard lawsDomesticStandard = lawsDomeStandardService.getOne(domesticStandardQueryWrapper);
-                                    standardValidFlag = true;
-                                    if (lawsDomesticStandard != null) {
-                                        log.error("第" + line + "行的标准编号已存在 ");
-                                        errMsg.append("拼接后的标准编号已存在于库中");
-                                        break;
-                                    }
-                                    // 判断是否有重复数据
-                                    if (keyMap.containsKey(domesticStandardNumber)) {
-                                        errMsgList.add("第" + keyMap.get(domesticStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
-                                    } else {
-                                        // 5. 如果不存在，则将 GradeName 和其行号添加到 HashMap 中
-                                        keyMap.put(domesticStandardNumber, line);
-                                    }
+                                    // 5. 如果不存在，则将 GradeName 和其行号添加到 HashMap 中
+                                    keyMap.put(domesticStandardNumber, line);
                                 }
                             }
                             // 将转好的值加入Map
@@ -238,7 +233,8 @@ public class ImportUtil {
 
                 // 字段长度校验
                 if (FieldShowTypeEnum.TEXT_BOX.getValue().equals(tag.getFieldShowType()) &&
-                        !FieldCommon.STANDARD_ENGLISH_NAME.equals(tag.getDbFieldName())) {
+                        !FieldCommon.STANDARD_ENGLISH_NAME.equals(tag.getDbFieldName()) &&
+                        !FieldCommon.STANDARD_NAME.equals(tag.getDbFieldName())) {
                     if (cellValue.length() > 50) {
                         log.error("第" + row + "列输入的" + tag.getDbFieldTxt() + "超过50字 ");
                         errMsg.append("第").append(row).append("列输入的").append(tag.getDbFieldTxt()).append("超过50字 ");