From c0085d7a833297f66485a59402160b03f6368f38 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 10 Oct 2024 15:39:43 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E6=A0=87=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=20=E5=AF=BC=E5=85=A5=E6=97=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=83=A8=E9=97=A8=E7=9A=84=E5=B1=82=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessAnnualInitLinkService.java | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
index 5936b1cc..135e2fb6 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitLinkService.java
@@ -12,8 +12,11 @@ import com.jero.modules.activiti.process.annualinit.common.ProcessAnnualInitComm
 import com.jero.modules.activiti.process.annualinit.entity.ProcessAnnualInitLink;
 import com.jero.modules.activiti.process.annualinit.mapper.ProcessAnnualInitLinkMapper;
 import com.jero.modules.activiti.process.annualinit.vo.ProcessAnnualInitLinkExcelVO;
+import com.jero.modules.laws.common.util.ImportUtil;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
+import com.jero.modules.system.entity.SysDepart;
+import com.jero.modules.system.service.ISysDepartService;
 import org.apache.commons.lang3.StringUtils;
 import org.jeecgframework.poi.excel.ExcelImportCheckUtil;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
@@ -53,6 +56,10 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
     private ISysBaseAPI sysBaseAPI;
     @Resource
     private ILawsEnterpriseStandardService enterpriseStandardService;
+    @Resource
+    private ImportUtil importUtil;
+    @Resource
+    private ISysDepartService sysDepartService;
 
     public IPage<ProcessAnnualInitLink> pageList(Page<ProcessAnnualInitLink> page, ProcessAnnualInitLink processAnnualInitLink, HttpServletRequest req) {
         QueryWrapper<ProcessAnnualInitLink> queryWrapper = QueryGenerator.initQueryWrapper(processAnnualInitLink, req.getParameterMap());
@@ -168,6 +175,10 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
 
         List<DictModel> dictModels4 = sysBaseAPI.getDictItems("yn");
         Map<String, String> ynMap = CollStreamUtil.toMap(dictModels4, DictModel::getText, DictModel::getValue);
+        // 准备部门校验的数据
+        List<SysDepart> departList = sysDepartService.list();
+        Map<String, List<SysDepart>> sysDepartMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName));
+        Map<String, String> sysDepartPathMap = SysDepart.buildPaths(departList);
 
         for (int i = 0; i < excelList.size(); i++) {
             StringBuilder msgSub = new StringBuilder();
@@ -204,13 +215,17 @@ public class ProcessAnnualInitLinkService extends ServiceImpl<ProcessAnnualInitL
                 excelVO.setMainDraftingUser(userMap.get(mainDraftingUser));
                 excelVO.setEmail(PasswordUtil.decrypt(emailMap.get(mainDraftingUser)));
             }
-            String departId = excelVO.getDepartId();
-            if (StringUtils.isBlank(departId)){
+            String departName = excelVO.getDepartId();
+            if (StringUtils.isBlank(departName)){
                 msgSub.append("第" + (i + 4) + "行" + "所在部门不能为空;");
-            }else if (!departMap.containsKey(departId)){
-                msgSub.append("第" + (i + 4) + "行" + "所在部门不存在;");
             }else {
-                excelVO.setDepartId(departMap.get(departId));
+                if (!importUtil.multiOrgValid(departName, sysDepartMap, sysDepartPathMap)) {
+                    msgSub.append("第" + (i + 4) + "行" + "所在部门填写错误 ");
+                } else {
+                    // 转为id
+                    String departId1 = importUtil.convertMultiOrgId(departName, sysDepartMap, sysDepartPathMap);
+                    excelVO.setDepartId(departId1);
+                }
             }
 
             String professionalModule = excelVO.getProfessionalModule();