From 013e00f6aff7135de4d45c0e78fc15770a2babae Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 1 Feb 2024 08:15:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080301=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=E6=A8=A1=E6=9D=BF=E5=BF=85=E5=A1=AB=E9=A1=B9?=
 =?UTF-8?q?=E4=B8=8E=E6=96=B0=E5=A2=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/modules/activiti/util/ExcelUtils.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 ec75136a..54038ee0 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
@@ -264,7 +264,10 @@ public class ExcelUtils {
     public String validAuthDept(String authDept, List<SysDictItemCore> listDict, String mainDraftingUnit,
                                 String standardClassification, Map<String, List<String>> authDeptMap, boolean mustInput) {
         // 先校验主起草部门
-        this.validMainDraftingUnit(mainDraftingUnit, listDict);
+        String validResult = this.validMainDraftingUnit(mainDraftingUnit, listDict);
+        if (StrUtil.isNotBlank(validResult)) {
+            return validResult;
+        }
 
         if (StrUtil.isBlank(authDept) && StrUtil.isBlank(standardClassification)) {
             return "";