From c11ae212651d9f6abad4d75f23f1e1d3f0ccf2a8 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Sep 2023 15:06:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AF=BC=E5=85=A5=E9=9B=B6=E9=83=A8?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/util/ImportUtil.java  | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 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 1788ff3b..76d9c741 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
@@ -13,8 +13,10 @@ import com.jero.modules.laws.standard.service.ILawsTreeNodeService;
 import com.jero.modules.oss.entity.OSSFile;
 import com.jero.modules.oss.service.IOSSFileService;
 import com.jero.modules.system.entity.SysDepart;
+import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysDepartService;
+import com.jero.modules.system.service.ISysDictItemService;
 import com.jero.modules.system.service.ISysUserService;
 import com.jero.modules.tag.entity.LawsTag;
 import com.jero.modules.tag.enums.FieldShowTypeEnum;
@@ -58,7 +60,9 @@ public class ImportUtil {
 
     @Resource
     private IOSSFileService ossFileService;
-
+    
+    @Resource
+    private ISysDictItemService sysDictItemService;
 
     public List<String> allColumnValid(Cell cell, LawsTag tag, int i, int j, Map<String, Object> parameterMap, Map<String, File> fileMap) {
         List<String> errMsgList = new ArrayList<>();
@@ -300,14 +304,14 @@ public class ImportUtil {
 
     // 零部件转换
     public String convertPartId(String cellValue) {
-        String[] valueList = cellValue.split("，");
-        Map<String, DictModel> sexDictModelMap =
-                sysBaseAPI.getDictItems("Part Name").stream()
-                        .collect(Collectors.toMap(DictModel::getText, d -> d));
-
+        List<String> valueList = Arrays.asList(cellValue.split("，"));
+        LambdaQueryWrapper<SysDictItem> sysDictItemLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysDictItemLambdaQueryWrapper.in(SysDictItem::getItemText, valueList);
+        Map<String, String> idMap = sysDictItemService.list(sysDictItemLambdaQueryWrapper).stream()
+                .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getId));
         StringBuilder result = new StringBuilder();
         for (String value : valueList) {
-            result.append(sexDictModelMap.get(value).getValue()).append(",");
+            result.append(idMap.get(value)).append(",");
         }
         // 去除掉最后的逗号
         return result.substring(0, result.length() - 1);
@@ -401,11 +405,11 @@ public class ImportUtil {
     // 零部件
     public boolean partValid(String cellValue) {
         String[] valueList = cellValue.split("，");
-        List<DictModel> educationDictModelList = sysBaseAPI.getDictItems("Part Name");
-        Map<String, DictModel> sexDictModelMap = educationDictModelList.stream()
+        List<DictModel> partDictModelList = sysBaseAPI.getDictItems("Part Name");
+        Map<String, DictModel> partDictModelMap = partDictModelList.stream()
                 .collect(Collectors.toMap(DictModel::getText, d -> d));
         for (String value : valueList) {
-            if (sexDictModelMap.get(value) == null) {
+            if (!partDictModelMap.containsKey(value)) {
                 return false;
             }
         }