From d4475d0e8d36a75980899246202ea420c3fad935 Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期三, 27 七月 2022 17:05:31 +0800
Subject: [PATCH] 优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） 无搜索条件时可通过search隐藏搜索按钮，工具条组右侧样式超出5px（相对于底部表格）,其父节点gutter代码生成默认10，此处也默认10，使工具组样式左右一致
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 4ade9f6..dab2bf8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -12,11 +12,9 @@
import com.ruoyi.common.core.domain.entity.SysMenu;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.web.service.SysLoginService;
import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.service.ISysMenuService;
/**
@@ -35,9 +33,6 @@
@Autowired
private SysPermissionService permissionService;
-
- @Autowired
- private TokenService tokenService;
/**
* 登录方法
@@ -64,8 +59,7 @@
@GetMapping("getInfo")
public AjaxResult getInfo()
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- SysUser user = loginUser.getUser();
+ SysUser user = SecurityUtils.getLoginUser().getUser();
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合
@@ -85,10 +79,8 @@
@GetMapping("getRouters")
public AjaxResult getRouters()
{
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- // 用户信息
- SysUser user = loginUser.getUser();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
return AjaxResult.success(menuService.buildMenus(menus));
}
}
--
Gitblit v1.9.2