From 1c52e77d77d0e924a1df0725c0748afde172ad68 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 30 十月 2026 16:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
index 17960f6..ca8377f 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java
@@ -65,7 +65,9 @@
}
else
{
- List<SysRole> roles = user.getRoles();
+ // 鐧诲綍鍚庣殑瑙掕壊鍒嗛厤鍙兘宸叉敼鍙橈紝涓嶈兘缁х画浣跨敤 token 涓殑瑙掕壊蹇収銆�
+ List<SysRole> roles = roleService.selectAssignedRolesByUserId(user.getUserId());
+ user.setRoles(roles);
if (!CollectionUtils.isEmpty(roles))
{
// 澶氳鑹茶缃畃ermissions灞炴�э紝浠ヤ究鏁版嵁鏉冮檺鍖归厤鏉冮檺
--
Gitblit v1.9.3