From 3ac77a359a7b099a28c8131637bd58da470e5154 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 9 Nov 2023 15:49:49 +0800
Subject: [PATCH] fix:78364

---
 .../controller/LawsWorkingGroupUserController.java  | 13 +++++--------
 .../impl/LawsWorkingGroupUserServiceImpl.java       |  3 +--
 2 files changed, 6 insertions(+), 10 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 05245b2c..f3b6fd29 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
@@ -94,7 +94,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     /**
      * 添加
      */
-    @RequiresPermissions("sys:innerWorkingGroup:add")
     @AutoLog(value = "内部工作组人员关联表-添加")
     @ApiOperation(value = "内部工作组人员关联表-添加", notes = "内部工作组人员关联表-添加")
     @PostMapping(value = "/add")
@@ -140,7 +139,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     /**
      * 通过id删除
      */
-    @RequiresPermissions("sys:innerWorkingGroup:delete")
     @AutoLog(value = "内部工作组人员关联表-通过id删除")
     @ApiOperation(value = "内部工作组人员关联表-通过id删除", notes = "内部工作组人员关联表-通过id删除")
     @PostMapping(value = "/delete")
@@ -162,7 +160,6 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
     /**
      * 通过excel导入数据
      */
-    @RequiresPermissions("sys:innerWorkingGroup:import")
     @AutoLog(value = "内部工作组人员关联表-导入")
     @ApiOperation(value = "内部工作组人员关联表-导入", notes = "内部工作组人员关联表-导入")
     @PostMapping(value = "/importExcel")
@@ -260,24 +257,24 @@ public class LawsWorkingGroupUserController extends JeroController<LawsWorkingGr
                     String username = lawsWorkingGroupUser.getUsername();
                     String realname = lawsWorkingGroupUser.getRealname();
                     if (StringUtils.isBlank(username)) {
-                        return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT, (i + 1));
+                        return MessageUtils.getMessage(ResultCommon.THE_JOB_NUMBER_CANNOT_BE_EMPTY_EXPORT, (i + 2));
                     }
                     if (StringUtils.isBlank(realname)) {
-                        return "第（" + (i + 1) + "）行,姓名不能为空";
+                        return "第（" + (i + 2) + "）行,姓名不能为空";
                     }
                     if(!CollectionUtils.isEmpty(listSysUser)){
                         String finalUsername = username;
                         Optional<SysUser> op = listSysUser.stream().filter(o->Objects.equals(o.getUsername(), finalUsername)).findFirst();
                         if(!op.isPresent()){
-                            return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT, (i + 1));
+                            return MessageUtils.getMessage(ResultCommon.JOB_NUMBER_DOES_NOT_EXIST_EXPORT, (i + 2));
                         }
                         username = op.get().getId();
                         if(!Objects.equals(op.get().getRealname(),realname)){
-                            return "第（" + (i + 1) + "）行,姓名与工号不匹配";
+                            return "第（" + (i + 2) + "）行,姓名与工号不匹配";
                         }
                     }
                     if (!existingWorkNos.add(username)) {
-                        return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT, (i + 1));
+                        return MessageUtils.getMessage(ResultCommon.DUPLICATE_JOB_NUMBER_EXPORT, (i + 2));
                     }
                     return null;
                 }).filter(Objects::nonNull).collect(Collectors.toList());
diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
index 59c6e002..2a90fdb2 100644
--- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsWorkingGroupUserServiceImpl.java
@@ -217,8 +217,7 @@ public class LawsWorkingGroupUserServiceImpl extends ServiceImpl<LawsWorkingGrou
 		mv.addObject(JeroController.FILE_NAME, title);
 		mv.addObject(JeroController.CLASS, LawsWorkingGroupUser.class);
 		ExportParams exportParams = new ExportParams(null, title);
-		// 导出xlsx
-		exportParams.setType(ExcelType.XSSF);
+		// 导出xls
 		mv.addObject(JeroController.PARAMS, exportParams);
 		mv.addObject(NormalExcelConstants.DATA_LIST, dos);
 		return mv;