From f546ba85aa19f7d532f180aff566d7118a95d199 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: Sun, 22 May 2022 12:39:01 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20DataPermissionHel?=
 =?UTF-8?q?per=20=E4=B8=8A=E4=B8=8B=E6=96=87=E5=AD=98=E5=82=A8=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20SaToken=20=E7=9A=84=E8=AF=B7=E6=B1=82=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/helper/DataPermissionHelper.java    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
index ec4d56767..0e60485ad 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataPermissionHelper.java
@@ -1,11 +1,11 @@
 package com.ruoyi.common.helper;
 
+import cn.dev33.satoken.context.SaHolder;
+import cn.dev33.satoken.context.model.SaStorage;
 import cn.hutool.core.util.ObjectUtil;
-import com.ruoyi.common.utils.ServletUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -33,11 +33,11 @@ public class DataPermissionHelper {
     }
 
     public static Map<String, Object> getContext() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        Object attribute = request.getAttribute(DATA_PERMISSION_KEY);
+        SaStorage saStorage = SaHolder.getStorage();
+        Object attribute = saStorage.get(DATA_PERMISSION_KEY);
         if (ObjectUtil.isNull(attribute)) {
-            request.setAttribute(DATA_PERMISSION_KEY, new HashMap<>());
-            attribute = request.getAttribute(DATA_PERMISSION_KEY);
+            saStorage.set(DATA_PERMISSION_KEY, new HashMap<>());
+            attribute = saStorage.get(DATA_PERMISSION_KEY);
         }
         if (attribute instanceof Map) {
             return (Map<String, Object>) attribute;