From 1b11e8279ef7b5f59658dd80ff8a16c16a2b5dd6 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 14 五月 2026 00:06:59 +0800
Subject: [PATCH] fex: 修复登录后用户权限丢失
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 42 ++++++++++++++++--------------------------
1 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index e08c368..e5c5bfa 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -12,10 +12,10 @@
import com.ruoyi.project.system.domain.SysMenu;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.project.system.service.ISysMenuService;
-import com.ruoyi.project.system.service.ISysUserDeptService;
-import com.ruoyi.project.system.service.ISysUserService;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.service.ISysMenuService;
+import com.ruoyi.project.system.service.ISysUserDeptService;
+import com.ruoyi.project.system.service.ISysUserService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
@@ -41,11 +41,11 @@
{
private SysLoginService loginService;
private ISysMenuService menuService;
- private SysPermissionService permissionService;
- private TokenService tokenService;
- private ISysUserDeptService userDeptService;
- private ISysUserService userService;
- private SysDeptMapper sysDeptMapper;
+ private SysPermissionService permissionService;
+ private TokenService tokenService;
+ private ISysUserDeptService userDeptService;
+ private ISysUserService userService;
+ private SysDeptMapper sysDeptMapper;
/**
* 鐧诲綍鏂规硶
@@ -73,17 +73,7 @@
public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = userService.selectUserById(loginUser.getUserId());
- if (user == null)
- {
- user = loginUser.getUser();
- }
- else
- {
- loginUser.setUser(user);
- loginUser.setAiEnabled(user.getAiEnabled());
- tokenService.setLoginUser(loginUser);
- }
+ SysUser user = loginUser.getUser();
// 鑾峰彇褰撳墠鐧诲綍鍏徃
Long tenantId = loginUser.getTenantId();
if(null != tenantId){
@@ -102,12 +92,12 @@
loginUser.setPermissions(permissions);
tokenService.refreshToken(loginUser);
}
- AjaxResult ajax = AjaxResult.success();
- ajax.put("user", user);
- ajax.put("aiEnabled", loginUser.getAiEnabled());
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
- return ajax;
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("user", user);
+ ajax.put("aiEnabled", loginUser.getAiEnabled());
+ ajax.put("roles", roles);
+ ajax.put("permissions", permissions);
+ return ajax;
}
/**
--
Gitblit v1.9.3