From 41962f7582274db24b177067a772b12d736cf0f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 24 Jan 2024 14:53:59 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E5=AF=BC=E5=85=A5=20=E6=A0=87=E5=87=86=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E5=88=86=E7=B1=BB1=E7=BA=A7=E5=92=8C3=E7=BA=A7?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E5=8A=A8=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  |  4 ---
 .../ProcessEsAnnualReportServiceImpl.java     |  4 ---
 .../modules/activiti/util/ExcelUtils.java     | 26 +++++++++----------
 .../modules/laws/common/util/ImportUtil.java  |  3 +++
 4 files changed, 15 insertions(+), 22 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 9e4403d3..a8ee9717 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
@@ -539,10 +539,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             } else {
                 item.setChangeStatus(ESPChangeType.CHANGE.getValue());
             }
-            // 如果标准等级分类是0级或3级，则需要将授权部门置空
-            if (item.getEnStandardClassification().equals("1") || item.getEnStandardClassification().equals("4")) {
-                item.setAuthDept(null);
-            }
         });
     }
 
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 ed7b6114..07670016 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
@@ -419,10 +419,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
             } else {
                 item.setChangeStatus(ESPChangeType.CHANGE.getValue());
             }
-            // 如果标准等级分类是0级或3级，则需要将授权部门置空
-            if (item.getEnStandardClassification().equals("1") || item.getEnStandardClassification().equals("4")) {
-                item.setAuthDept(null);
-            }
         });
     }
 
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 c425c5c1..e33ba514 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
@@ -265,24 +265,22 @@ public class ExcelUtils {
 
         // 检查授权部门
         if (!excelUtils.validDict("standard_grade_classify", standardClassification, null,
-                                null, true, listDict)) {
+                null, true, listDict)) {
             return "'标准等级分类'无效。";
         }
 
         String level = translateDictValue("standard_grade_classify", standardClassification, listDict);
 
+        if (StrUtil.isBlank(authDept)) {
+            return "'授权部门'不能为空。";
+        }
+        // 检查授权部门
+        if (!excelUtils.validDict("depart_name", authDept, "sys_depart", "id", false, listDict)) {
+            return "'授权部门'无效。";
+        }
+        // 将授权部门转换为idList
+        String deptIds = excelUtils.translateDictValue("depart_name", "id", "sys_depart", authDept, listDict);
         if (level.equals("2") || level.equals("3")) {
-            if (StrUtil.isBlank(authDept)) {
-                return "'授权部门'不能为空。";
-            }
-
-            // 检查授权部门
-            if (!excelUtils.validDict("depart_name", authDept, "sys_depart", "id", false, listDict)) {
-                return "'授权部门'无效。";
-            }
-
-            // 将授权部门转换为idList
-            String deptIds = excelUtils.translateDictValue("depart_name", "id", "sys_depart", authDept, listDict);
             boolean isMatching = isMatchingAuthDept(
                     Arrays.asList(deptIds.split(",")),
                     level.equals("2") ? authDeptMap.get("1") : authDeptMap.get("2")
@@ -418,7 +416,7 @@ public class ExcelUtils {
 
     public String validPartName(String value, List<SysDictItemCore> listDict) {
         if (StrUtil.isBlank(value)) {
-            return "零部件名称不能为空";
+            return "零部件名称不能为空。";
         }
         // 检查工作组
         if (!excelUtils.validDict("part_name", value, null, null, true, listDict)) {
@@ -440,7 +438,7 @@ public class ExcelUtils {
 
     public String validStandardName(String value) {
         if (StrUtil.isBlank(value)) {
-            return "新企标名称不能为空";
+            return "'新企标名称不能为空'。";
         }
         if (value.length() > 50) {
             return "'新企标名称'过长（最多50字）。";
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 61ec840b..297a908d 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
@@ -506,6 +506,9 @@ public class ImportUtil {
     }
 
     public Date convertDate(String cellValue) {
+        if (StrUtil.isBlank(cellValue)) {
+            return null;
+        }
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         // 设置lenient为false，使得日期解析更为严格
         sdf.setLenient(false);