From 2b6d097f0c5fa392d8276ddf7ee12c0b103455a4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 5 Nov 2023 22:23:13 +0800
Subject: [PATCH] fix: 77892
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

企业标准--导入--必填字段未填写，错误提示语行数不对应
---
 .../laws/common/service/impl/LawsCommonServiceImpl.java   | 8 +++++++-
 .../com/jero/modules/laws/common/util/ImportUtil.java     | 4 ++--
 2 files changed, 9 insertions(+), 3 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 3f95af8f..848ad022 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
@@ -1471,7 +1471,13 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
             // 按照实际顺序创建headerList
             List<LawsTag> headerList = new ArrayList<>();
             for (Cell cell : hearderRow) {
-                headerList.add(headerMap.get(cell.toString().replace("*", "")));
+                LawsTag tag = headerMap.get(cell.toString().replace("*", ""));
+                if (tag == null && !cell.toString().equals("稽查内容")) {
+                    FileUnZip.deleteDir(saveDirectory);
+                    throw new JeroBootException(MessageUtils.getMessage(ResultCommon.IMPORT_TEMPLATE_ERROR));
+                } else {
+                    headerList.add(tag);
+                }
             }
             // 如果是企标的话手动添加稽查内容字段
             if (TableNameEnum.ENTERPRISE_STANDARDS.getTableName().equals(tableName)) {
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 3a8f342c..f4c872b1 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
@@ -102,7 +102,7 @@ public class ImportUtil {
                 if (YesOrNoEnum.YES.getValue().equals(tag.getFieldMustInput())) {
                     if (!this.mustInputValid(cell)) {
                         log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 ");
-                        errMsg.append("第").append(i).append("行第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
+                        errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
                         continue;
                     }
                 }
@@ -293,7 +293,7 @@ public class ImportUtil {
                     }
                 }
             }
-            if (errMsg.toString().contains("填写错误")) {
+            if (errMsg.toString().contains("列")) {
                 errMsgList.add(errMsg.toString());
             } else {
                 insertDataList.add(parameterMap);