From 698595807f01792d8e4cea8d92889cbb4b39c270 Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 7 Aug 2024 14:53:17 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8,=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysDictController.java       |  6 +++++-
 .../system/controller/SysUserController.java       | 14 +++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
index e8181fdd..9abd7bed 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java
@@ -494,6 +494,11 @@ public class SysDictController {
 		ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
 		List<SysDictPage> pageList = new ArrayList<>();
 
+		String selections = request.getParameter("selections");
+		if(!oConvertUtils.isEmpty(selections)){
+			queryWrapper.in("id",selections.split(","));
+		}
+
 		List<SysDict> sysDictList = sysDictService.list(queryWrapper);
 		for (SysDict dictMain : sysDictList) {
 			SysDictPage vo = new SysDictPage();
@@ -503,7 +508,6 @@ public class SysDictController {
 			vo.setSysDictItemList(sysDictItemList);
 			pageList.add(vo);
 		}
-
 		// 导出文件名称
 		mv.addObject(JeroController.FILE_NAME, "数据字典");
 		// 注解对象Class
diff --git a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
index 8173ddad..827a17d7 100644
--- a/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+++ b/laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
@@ -544,7 +544,15 @@ public class SysUserController {
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(SysUser sysUser,HttpServletRequest request) {
         // Step.1 组装查询条件
+        String departId = request.getParameter("departId");
+        String roleId = request.getParameter("roleId");
+        String groupId = request.getParameter("groupId");
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(sysUser, request.getParameterMap());
+        Page<SysUser> page = new Page<>(-1, -1);
+        List<String> subDepIds = null;
+        if (StrUtil.isNotEmpty(departId)){
+            subDepIds = sysDepartService.getSubDepIdsByDepId(departId);
+        }
         //Step.2 AutoPoi 导出Excel
         ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
         //update-begin--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据--------------------
@@ -553,7 +561,9 @@ public class SysUserController {
            queryWrapper.in("id",Arrays.asList(selections.split(",")));
        }
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
-        List<SysUser> pageList = sysUserService.list(queryWrapper);
+        queryWrapper.ne("username", "admin");
+        IPage<SysUser> sysUserIPage = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
+        List<SysUser> pageList = sysUserIPage.getRecords();
         if(!CollectionUtils.isEmpty(pageList)){
             //批量查询用户的所属部门
             //step.1 先拿到全部的 useids
@@ -566,8 +576,6 @@ public class SysUserController {
             pageList.forEach(item->{
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
                 item.setRoleTxt(useRoleNames.get(item.getId()));
-                // 对手机号、邮箱进行解密处理
-                sysUserService.proceedUserInfoDecrypt(item);
             });
         }