From 063c454df12bdb65ad86070659cbe202366e01a4 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 31 Jul 2024 17:59:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2087523=20=E4=BC=81=E4=B8=9A=E6=A0=87?=
 =?UTF-8?q?=E5=87=86-=E5=AF=BC=E5=85=A5=20=E6=B6=89=E5=8F=8A=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F/=E9=83=A8=E4=BB=B6=E6=B2=A1=E6=9C=89=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/laws/common/util/ImportUtil.java  | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 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 b5c282fa..2a6ca54a 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
@@ -385,7 +385,10 @@ public class ImportUtil {
 
                 // 企标稽查内容文件导入
                 if (FieldShowTypeEnum.INSPECT_CONTENT_FILE_UPLOAD.getValue().equals(tag.getFieldShowType())) {
-                    if (!this.inspectContentFileValid(cellValue, fileMap)) {
+                    List<SysDepart> departList = sysDepartService.list();
+                    Map<String, List<SysDepart>> deaprtMap = departList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName));
+                    Map<String, String> departPartMap = SysDepart.buildPaths(departList);
+                    if (!this.inspectContentFileValid(cellValue, fileMap, deaprtMap, departPartMap)) {
                         log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
                         errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
                     } else {
@@ -808,7 +811,8 @@ public class ImportUtil {
     }
 
     // 文件校验
-    private boolean inspectContentFileValid(String cellValue, Map<String, File> fileMap) {
+    private boolean inspectContentFileValid(String cellValue, Map<String, File> fileMap,
+                                            Map<String, List<SysDepart>> deaprtMap, Map<String, String> departPartMap) {
         // 检查是否真的有这个文件
         if (!this.fileValid(cellValue, fileMap)) {
             return false;
@@ -835,12 +839,12 @@ public class ImportUtil {
                 String cellContent2 = getCellContent(row.getCell(1));
                 String cellContent3 = getCellContent(row.getCell(2));
                 // 执行valid方法进行校验
-                if (!valid(cellContent1, cellContent2)) {
+                if (!valid(cellContent1, cellContent2, cellContent3, deaprtMap, departPartMap)) {
                     return false;
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage());
             return false;
         }
         return true;
@@ -876,9 +880,16 @@ public class ImportUtil {
     }
 
     // 必填校验
-    private boolean valid(String content1, String content2) {
+    private boolean valid(String content1, String content2, String content3, Map<String, List<SysDepart>> deaprtMap, Map<String, String> departPartMap) {
         // 这里只做简单的非空校验
-        return content1 != null && !content1.trim().isEmpty() && content2 != null && !content2.trim().isEmpty();
+        if (content1 != null && !content1.trim().isEmpty() && content2 != null && !content2.trim().isEmpty()) {
+            if (StrUtil.isNotBlank(content3)) {
+                return multiOrgValid(content3, deaprtMap, departPartMap);
+            }
+            return true;
+        } else {
+            return false;
+        }
     }
 
 }