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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 ba48829..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
@@ -74,7 +74,7 @@
SysUser user = loginUser.getUser();
//鏌ヨ鐢ㄦ埛淇℃伅
//TODO:閲嶅啓鏌ヨ鐢ㄦ埛淇℃伅sql
-// SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
+ SysUserVO userInfo = userMapper.selectUserInfo(user.getUserId());
// 瑙掕壊闆嗗悎
Set<String> roles = permissionService.getRolePermission(user);
// 鏉冮檺闆嗗悎
@@ -85,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