From d81056cbe7aba6702ba048501346c56475a00d7a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 16 十二月 2021 13:55:14 +0800
Subject: [PATCH] update 修改 缓存懒加载 为 false 默认启动预加载数据
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
index 39b828d..9ddb217 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
@@ -4,6 +4,7 @@
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -46,8 +47,8 @@
@ApiOperation("鏌ヨ瑙掕壊淇℃伅鍒楄〃")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/list")
- public TableDataInfo<SysRole> list(SysRole role) {
- return roleService.selectPageRoleList(role);
+ public TableDataInfo<SysRole> list(SysRole role, PageQuery pageQuery) {
+ return roleService.selectPageRoleList(role, pageQuery);
}
@ApiOperation("瀵煎嚭瑙掕壊淇℃伅鍒楄〃")
@@ -105,9 +106,9 @@
if (roleService.updateRole(role) > 0) {
// 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
LoginUser loginUser = getLoginUser();
- if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin()) {
- loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
- loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+ SysUser sysUser = userService.selectUserById(loginUser.getUserId());
+ if (StringUtils.isNotNull(sysUser) && !sysUser.isAdmin()) {
+ loginUser.setMenuPermissions(permissionService.getMenuPermission(sysUser));
tokenService.setLoginUser(loginUser);
}
return AjaxResult.success();
@@ -166,8 +167,8 @@
@ApiOperation("鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/authUser/allocatedList")
- public TableDataInfo<SysUser> allocatedList(SysUser user) {
- return userService.selectAllocatedList(user);
+ public TableDataInfo<SysUser> allocatedList(SysUser user, PageQuery pageQuery) {
+ return userService.selectAllocatedList(user, pageQuery);
}
/**
@@ -176,8 +177,8 @@
@ApiOperation("鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�")
@PreAuthorize("@ss.hasPermi('system:role:list')")
@GetMapping("/authUser/unallocatedList")
- public TableDataInfo<SysUser> unallocatedList(SysUser user) {
- return userService.selectUnallocatedList(user);
+ public TableDataInfo<SysUser> unallocatedList(SysUser user, PageQuery pageQuery) {
+ return userService.selectUnallocatedList(user, pageQuery);
}
/**
--
Gitblit v1.9.3