From e14edac7defe40603aaf2769a459b4a156e448f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 7 Feb 2024 11:31:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080294=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92-=E5=90=84=E9=83=A8?=
 =?UTF-8?q?=E6=89=80=E8=81=94=E7=BB=9C=E4=BA=BA=20=E5=A1=AB=E5=86=99/?=
 =?UTF-8?q?=E4=B8=8B=E5=8F=91=E4=BB=BB=E5=8A=A1--=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=A4=B1=E8=B4=A5=E6=8F=90=E7=A4=BA=E8=AF=AD?=
 =?UTF-8?q?=E4=B8=8D=E5=90=88=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java        | 2 +-
 .../service/impl/ProcessEsAnnualReportServiceImpl.java      | 2 +-
 .../java/com/jero/modules/activiti/util/ExcelUtils.java     | 2 +-
 .../java/com/jero/modules/laws/common/util/ImportUtil.java  | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 1629ef16..99a9da85 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -567,7 +567,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
             item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
             item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
+            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem(), "3"));
             item.setContactUser(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getContactUser(), listDict));
             item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
             item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index baa57586..898e89b5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -479,7 +479,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             item.setMainDraftingUnit(excelUtils.translateDictValue("depart_name", "id", "sys_depart", item.getMainDraftingUnit(), listDict));
             item.setMainDraftingUnitResponsiblePerson(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getMainDraftingUnitResponsiblePerson(), listDict));
             item.setStandardPromoter(excelUtils.translateDictValue("CONCAT(realname, '(', username, ')')", "id", "sys_user", item.getStandardPromoter(), listDict));
-            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem()));
+            item.setEnStandardSystem(importUtil.convertStandardSystem(item.getEnStandardSystem(), "3"));
             item.setWorkGroup(excelUtils.translateDictValue("name", "id", "laws_working_group", item.getWorkGroup(), listDict));
             item.setStandardType(excelUtils.translateDictValue("esp_standard_type", item.getStandardType(), listDict));
             item.setEnStandardClassification(excelUtils.translateDictValue("standard_grade_classify", item.getEnStandardClassification(), listDict));
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
index 04ecd0a7..8ceea645 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/util/ExcelUtils.java
@@ -407,7 +407,7 @@ public class ExcelUtils {
         }
         // 检查工作组
         if (!excelUtils.validDict("name", value, "laws_working_group", "id", true, listDict)) {
-            return "'工作组'无效。";
+            return "'隶属工作组'无效。";
         }
         return "";
     }
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 d60eac0b..fe32f943 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
@@ -419,7 +419,8 @@ public class ImportUtil {
                         errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
                     } else {
                         // 转为id
-                        cellValue = this.convertStandardSystem(cellValue);
+                        String moduleCode = tag.getIsModel();
+                        cellValue = this.convertStandardSystem(cellValue, moduleCode);
                     }
                 }
                 // 文件
@@ -727,10 +728,11 @@ public class ImportUtil {
     }
 
     // 体系转换
-    public String convertStandardSystem(String cellValue) {
+    public String convertStandardSystem(String cellValue, String moduleCode) {
         List<String> valueList = Arrays.asList(cellValue.split(","));
         LambdaQueryWrapper<LawsTreeNode> treeNodeLambdaQueryWrapper = new LambdaQueryWrapper<>();
         treeNodeLambdaQueryWrapper.in(LawsTreeNode::getNodeName, valueList);
+        treeNodeLambdaQueryWrapper.eq(LawsTreeNode::getModuleCode, moduleCode);
         List<LawsTreeNode> treeNodeList = lawsTreeNodeService.list(treeNodeLambdaQueryWrapper);
         Map<String, String> systemMap = treeNodeList.stream().collect(Collectors.toMap(LawsTreeNode::getNodeName, LawsTreeNode::getId));