From e99e01afe2898ba11b8c918906d75dcf189435b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 10 Nov 2023 18:32:22 +0800
Subject: [PATCH] fix:78440

---
 .../LawsWorkingGroupUserController.java       | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
index 0553e8b5..bf12d0a7 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsWorkingGroupUserController.java
@@ -162,7 +162,7 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     @AutoLog(value = "内部工作组人员关联表-导入")
     @ApiOperation(value = "内部工作组人员关联表-导入", notes = "内部工作组人员关联表-导入")
     @PostMapping(value = "/importExcel")
-    public Result<String> importFile(MultipartFile file, String workingGroupId) throws Exception {
+    public Result<?> importFile(MultipartFile file, String workingGroupId) throws Exception {
         String fileName = file.getOriginalFilename();
         // 上传文件为空
         if (StringUtils.isEmpty(fileName)) {
@@ -192,28 +192,30 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
         }
 
         List<LawsWorkingGroupUser> all = new ArrayList<>();
+        List<LawsWorkingGroupUserImport> list;
         try {
             ImportParams params = new ImportParams();
             params.setTitleRows(0);
             params.setHeadRows(1);
             params.setNeedSave(true);
-            List<LawsWorkingGroupUserImport> list = ExcelImportUtil.importExcel(file.getInputStream(), LawsWorkingGroupUserImport.class, params);
-            if (CollectionUtils.isEmpty(list)) {
-                throw new JeroBootException(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY);
-            }
-            for (LawsWorkingGroupUserImport lawsWorkingGroupUserImport : list) {
-                LawsWorkingGroupUser lawsWorkingGroupUser = new LawsWorkingGroupUser();
-                lawsWorkingGroupUser.setUsername(lawsWorkingGroupUserImport.getUsername());
-                lawsWorkingGroupUser.setRealname(lawsWorkingGroupUserImport.getRealname());
-                all.add(lawsWorkingGroupUser);
-            }
+            list = ExcelImportUtil.importExcel(file.getInputStream(), LawsWorkingGroupUserImport.class, params);
         } catch (Exception e) {
-            throw new JeroBootException(ResultCommon.ERROR);
+            throw new JeroBootException(e.getMessage());
+        }
+        if (CollectionUtils.isEmpty(list)) {
+            throw new JeroBootException(ResultCommon.IMPORT_DATA_CANNOT_BE_EMPTY);
+        }
+
+        for (LawsWorkingGroupUserImport lawsWorkingGroupUserImport : list) {
+            LawsWorkingGroupUser lawsWorkingGroupUser = new LawsWorkingGroupUser();
+            lawsWorkingGroupUser.setUsername(lawsWorkingGroupUserImport.getUsername());
+            lawsWorkingGroupUser.setRealname(lawsWorkingGroupUserImport.getRealname());
+            all.add(lawsWorkingGroupUser);
         }
         //校验导入正确性，msg是错误信息
-        String msg = importExcelCheck(all,workingGroupId);
-        if (StringUtils.isNotBlank(msg)) {
-            return Result.error(msg);
+        List<String> msg = importExcelCheck(all,workingGroupId);
+        if (!CollectionUtils.isEmpty(msg)) {
+            return Result.error(MessageUtils.getMessage(ResultCommon.ERROR),msg);
         }
         for (LawsWorkingGroupUser groupUser : all) {
             String username = groupUser.getUsername();
@@ -240,9 +242,8 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     /**
      * 导入数据校验错误信息
      */
-    public String importExcelCheck(List<LawsWorkingGroupUser> all,String workingGroupId) {
-        List<String> errorMessages = validateWorkNo(all,workingGroupId);
-        return String.join(";", errorMessages);
+    public List<String> importExcelCheck(List<LawsWorkingGroupUser> all,String workingGroupId) {
+        return validateWorkNo(all,workingGroupId);
     }
 
     private List<String> validateWorkNo(List<LawsWorkingGroupUser> all,String workingGroupId) {