From 3f5de95a54b9f2a2363641a5a7061a9905e3baf2 Mon Sep 17 00:00:00 2001
From: lxr <2416610236@qq.com>
Date: Wed, 28 Jan 2026 17:31:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20getUserId()=E6=96=B9=E6=B3=95=E5=9C=A8?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB=E5=BD=95=E6=97=B6=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9Enull=E8=80=8C=E4=B8=8D=E6=98=AF0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改SecurityContextHolder.getUserId()方法，未登录时返回null
- 避免未登录状态与用户ID为0的情况混淆
- UserConstants.isAdmin()已有null检查，兼容此修改
---
 .../com/ruoyi/common/core/context/SecurityContextHolder.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
index 2a8dde846..49b08fd62 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
@@ -53,7 +53,8 @@ public class SecurityContextHolder
 
     public static Long getUserId()
     {
-        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
+        String value = get(SecurityConstants.DETAILS_USER_ID);
+        return StringUtils.isEmpty(value) ? null : Convert.toLong(value);
     }
 
     public static void setUserId(String account)