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 validExcelData(Sheet sheet, List headerList, Map fileMap, List> insertDataList) { List errMsgList = new ArrayList<>(); - + Map keyMap = new HashMap<>(); // 从数据行开始遍历 for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) { - Map 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