From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 ae31b90..73768ba 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
@@ -2,6 +2,9 @@
import java.util.List;
import java.util.Set;
+
+import com.ruoyi.common.core.vo.SysUserVO;
+import com.ruoyi.system.mapper.UserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -39,6 +42,9 @@
@Autowired
private TokenService tokenService;
+ @Autowired
+ private UserMapper userMapper;
+
/**
* 鐧诲綍鏂规硶
*
@@ -66,6 +72,9 @@
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
+ //鏌ヨ鐢ㄦ埛淇℃伅
+ //TODO:閲嶅啓鏌ヨ鐢ㄦ埛淇℃伅sql
+ SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -76,7 +85,7 @@
tokenService.refreshToken(loginUser);
}
AjaxResult ajax = AjaxResult.success();
- ajax.put("user", user);
+ ajax.put("user", userInfo);
ajax.put("roles", roles);
ajax.put("permissions", permissions);
return ajax;
--
Gitblit v1.9.3