From 7f64fa703732e13e4eb811dcaed30fd9a43c1519 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 12 一月 2024 15:04:41 +0800
Subject: [PATCH] update lock4j 2.2.5 => 2.2.7 消除启动警告
---
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
index 41319c1..9ab25e7 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
@@ -72,9 +72,8 @@
@SaCheckPermission("system:user:export")
@PostMapping("/export")
public void export(SysUserBo user, HttpServletResponse response) {
- List<SysUserVo> list = userService.selectUserList(user);
- List<SysUserExportVo> listVo = MapstructUtils.convert(list, SysUserExportVo.class);
- ExcelUtil.exportExcel(listVo, "鐢ㄦ埛鏁版嵁", SysUserExportVo.class, response);
+ List<SysUserExportVo> list = userService.selectUserExportList(user);
+ ExcelUtil.exportExcel(list, "鐢ㄦ埛鏁版嵁", SysUserExportVo.class, response);
}
/**
@@ -116,7 +115,6 @@
if (ObjectUtil.isNull(user)) {
return R.fail("娌℃湁鏉冮檺璁块棶鐢ㄦ埛鏁版嵁!");
}
- user.setRoles(roleService.selectRolesByUserId(user.getUserId()));
userInfoVo.setUser(user);
userInfoVo.setPermissions(loginUser.getMenuPermission());
userInfoVo.setRoles(loginUser.getRolePermission());
--
Gitblit v1.9.3