From 1d70c445e6c04162071b735cf9f075060972df47 Mon Sep 17 00:00:00 2001
From: wangliwen <wangliwen@hisense.com>
Date: Mon, 31 Oct 2022 10:05:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E6=95=B0=E6=8D=AE=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/resource/service/impl/ResourceServiceImpl.java   | 3 +++
 .../io/renren/modules/sys/controller/SysUserController.java  | 2 +-
 .../renren/modules/sys/service/impl/SysUserServiceImpl.java  | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
index bf72ffd4..53468243 100644
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@@ -225,6 +225,9 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                 wrapper.in(true, "del_flag", 0, 5);
             }
         }
+        if (params.containsKey("infoList")) {
+            // TODO
+        }
         wrapper.orderByAsc("del_flag").orderByDesc("create_date");
         return wrapper;
     }
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
index 143cb205..b3b3b65e 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/controller/SysUserController.java
@@ -168,7 +168,7 @@ public class SysUserController {
     @ApiImplicitParam(name = "username", value = "用户名", paramType = "query", dataType = "String")
     public void export(@ApiIgnore @RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
         List<SysUserDTO> list = sysUserService.list(params);
-
+        params.put("export", true);
         ExcelUtils.exportExcelToTarget(response, null, "用户管理", list, SysUserExcel.class);
     }
 
diff --git a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
index c5047c0b..b1aaf7fb 100644
--- a/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/sys/service/impl/SysUserServiceImpl.java
@@ -97,7 +97,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
 
     @Override
     public List<SysUserDTO> list(Map<String, Object> params) {
-        //普通管理员，只能查询所属部门及子部门的数据
+        // 普通管理员，只能查询所属部门及子部门的数据
         UserDetail user = SecurityUser.getUser();
         if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {
             params.put("deptIdList", sysDeptService.getSubDeptIdList(user.getDeptId()));
@@ -106,6 +106,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
         if (roleDTO != null) {
             params.put("role_id", roleDTO.getId());
         }
+        if (params.containsKey("export")) { // 导出特殊处理
+            params.remove("role_id");
+        }
         List<SysUserEntity> entityList = baseDao.getList(params);
 
         return ConvertUtils.sourceToTarget(entityList, SysUserDTO.class);