From a02483aa1df9b3d3b97cfb951150d14cf424c44d Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 26 Aug 2024 09:22:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BC=E5=85=A5=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B6=85=E9=95=BF=E6=8A=A5=E9=94=99=E6=8F=90=E7=A4=BA=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsCommonServiceImpl.java   | 31 ++++++++++---------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 9908bf05..5e48c67a 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -1663,26 +1663,27 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
 
     @Override
     public List<String> importExcelWithData(MultipartFile file, String module) {
+        List<Map<String, Object>> insertDataList = new ArrayList<>();
+        String tableName = TableNameEnum.getTableName(module);
+        List<String> errorMsgsList;
         try {
-            List<Map<String, Object>> insertDataList = new ArrayList<>();
-            String tableName = TableNameEnum.getTableName(module);
-            List<String> errorMsgsList = this.validDataFormat(insertDataList, file, tableName);
-            // 判断如果校验有问题则返回校验错误信息，没问题则将数据转化为导入方法所需参数
-            if (!errorMsgsList.isEmpty()) {
-                return errorMsgsList;
-            } else {
-                // 执行新增功能
-                for (Map<String, Object> map : insertDataList) {
-                    // 获取操作模块
-                    map.put(FieldCommon.MODULE, module);
-                    commonService.commonAdd(map);
-                }
-                return new ArrayList<>();
-            }
+            errorMsgsList = this.validDataFormat(insertDataList, file, tableName);
         } catch (IOException e) {
             log.error("数据导入异常，请检查", e);
             throw new JeroBootException("数据导入异常，请检查");
         }
+        // 判断如果校验有问题则返回校验错误信息，没问题则将数据转化为导入方法所需参数
+        if (!errorMsgsList.isEmpty()) {
+            return errorMsgsList;
+        } else {
+            // 执行新增功能
+            for (Map<String, Object> map : insertDataList) {
+                // 获取操作模块
+                map.put(FieldCommon.MODULE, module);
+                commonService.commonAdd(map);
+            }
+            return new ArrayList<>();
+        }
     }
 
     /**