From 2cf783a1480050c0f13907c5fde625edee8fce62 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期三, 16 七月 2025 16:41:23 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0 --- ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java index 589eb06..52d414f 100644 --- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java +++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java @@ -52,7 +52,11 @@ public static SysUser getSysUser() { - return getLoginUser().getSysUser(); +// return getLoginUser().getSysUser(); + SysUser sysUser = new SysUser(); + + sysUser.setUserId(Long.valueOf(SecurityContextHolder.get("user_id"))); + return sysUser; } /** -- Gitblit v1.7.1