From fbbed3905abbe7fe4d18561153fb388366a64f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Wed, 19 Aug 2026 14:26:42 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=BF=9C=E7=A8=8B=E4=BC=A0=E8=BE=93=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/mybatis/helper/DataPermissionHelper.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java
index c18c5878e..09fc4ce64 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataPermissionHelper.java
@@ -100,11 +100,14 @@ public class DataPermissionHelper {
      * @throws NullPointerException 如果数据权限上下文类型异常，则抛出NullPointerException
      */
     public static Map<String, Object> getContext() {
-        SaStorage saStorage = SaHolder.getStorage();
-        Object attribute = saStorage.get(DATA_PERMISSION_KEY);
-        if (ObjectUtil.isNull(attribute)) {
-            saStorage.set(DATA_PERMISSION_KEY, new HashMap<>());
+        Object attribute = new HashMap<>();
+        if (SaHolder.getContext().isValid()) {
+            SaStorage saStorage = SaHolder.getStorage();
             attribute = saStorage.get(DATA_PERMISSION_KEY);
+            if (ObjectUtil.isNull(attribute)) {
+                saStorage.set(DATA_PERMISSION_KEY, new HashMap<>());
+                attribute = saStorage.get(DATA_PERMISSION_KEY);
+            }
         }
         if (attribute instanceof Map map) {
             return map;