From 2c179fdd8b576ed8b9377857987b2c9d97810246 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 6 Nov 2023 14:32:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/util/ImportUtil.java     | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 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 4b1947c0..385502de 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
@@ -85,10 +85,9 @@ public class ImportUtil {
 
     public List<String> validExcelData(Sheet sheet, List<LawsTag> headerList, Map<String, File> fileMap, List<Map<String, Object>> insertDataList) {
         List<String> errMsgList = new ArrayList<>();
-
+        Map<String, Integer> keyMap = new HashMap<>();
         // 从数据行开始遍历
         for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) {
-            Map<String, Integer> keyMap = new HashMap<>();
             int line = i + 1;
             String standardNumber = "";
             String standardClass = "";
@@ -168,6 +167,13 @@ public class ImportUtil {
                                         break;
                                     }
                                     standardClass = this.convertDictValue("standard_type" , standardClass);
+                                    // 判断是否有重复数据
+                                    if (keyMap.containsKey(domesticStandardNumber)) {
+                                        errMsgList.add("第" + keyMap.get(domesticStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
+                                    } else {
+                                        // 5. 如果不存在，则将 GradeName 和其行号添加到 HashMap 中
+                                        keyMap.put(domesticStandardNumber, line);
+                                    }
                                 }
                             }
                             if ((TableNameEnum.FOREIGN_REGULATIONS.getValue().equals(tag.getIsModel()))) {
@@ -188,6 +194,12 @@ public class ImportUtil {
                                         break;
                                     }
                                     standardClass = this.convertDictValue("standard_type_overseas" , standardClass);
+                                    // 判断是否有重复数据
+                                    if (keyMap.containsKey(foreignStandardNumber)) {
+                                        errMsgList.add("第" + keyMap.get(foreignStandardNumber) + "行'标准编号'与第" + line + "行数据重复。");
+                                    } else {
+                                        keyMap.put(foreignStandardNumber, line);
+                                    }
                                 }
                             }
                             // 将转好的值加入Map