From 4c5b521626714fbd92ba5e96a98cf3077bfd648f Mon Sep 17 00:00:00 2001
From: sunzheng <sunzheng.cn>
Date: Wed, 7 Aug 2024 14:34:08 +0800
Subject: [PATCH] =?UTF-8?q?update:=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87=E6=9C=BA?=
 =?UTF-8?q?=E6=9E=84,=E8=A7=92=E8=89=B2=E5=90=8E=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E5=85=A8=E9=83=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/controller/SysUserController.java  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

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 15c7569e..1d04f3f5 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
@@ -537,17 +537,27 @@ 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");
+        sysUser.setPhone(this.sysUserService.proceedPhoneEncrypt(sysUser.getPhone()));
         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]用户导出，如果选择数据则只导出相关数据--------------------
         String selections = request.getParameter("selections");
-       if(!oConvertUtils.isEmpty(selections)){
-           queryWrapper.in("id",Arrays.asList(selections.split(",")));
-       }
+        if(!oConvertUtils.isEmpty(selections)){
+            queryWrapper.in("id",Arrays.asList(selections.split(",")));
+        }
         //update-end--Author:kangxiaolin  Date:20180825 for：[03]用户导出，如果选择数据则只导出相关数据----------------------
         queryWrapper.ne("username", "admin");
-        List<SysUser> pageList = sysUserService.list(queryWrapper);
+        IPage<SysUser> sysUserIPage = sysUserService.queryPage(page, subDepIds, roleId, groupId, queryWrapper);
+        List<SysUser> pageList = sysUserIPage.getRecords();
         if(!CollectionUtils.isEmpty(pageList)){
             //批量查询用户的所属部门
             //step.1 先拿到全部的 useids
@@ -560,13 +570,9 @@ public class SysUserController {
             pageList.forEach(item->{
                 item.setOrgCodeTxt(useDepNames.get(item.getId()));
                 item.setRoleTxt(useRoleNames.get(item.getId()));
-                // 对手机号、邮箱进行解密处理
-                sysUserService.proceedUserInfoDecrypt(item);
             });
         }
 
-
-
         //导出文件名称
         mv.addObject(JeroController.FILE_NAME, "用户列表");
         mv.addObject(JeroController.CLASS, SysUser.class);