From d68181ce2faef4821d6d8a8ffb8027480a6262c3 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 05 Nov 2025 17:01:20 +0800
Subject: [PATCH] 2025-11-5 zwy websockeet增加Type:livestream,开启机场和飞行器的直播接口, 增加LiveStreamHandler对开启直播和关闭直播的处理; redis增加WEBSOCKET_VideoId_PREFIX,存储videoid,关闭直播功能时使用;

---
 ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java b/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
index e450375..7018c6b 100644
--- a/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
+++ b/ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java
@@ -20,7 +20,7 @@
 /**
  * 数据过滤处理
  *
- * @author ruoyi
+ * @author ard
  */
 @Aspect
 @Component
@@ -64,7 +64,16 @@
     }
 
     protected void handleDataScope(final JoinPoint joinPoint, DataScope controllerDataScope)
-    {
+    {  /**
+     * 自定义权限是否生效 baseEntity中  useStatus为false不使用数据权限
+     */
+        Object params = joinPoint.getArgs()[0];
+        if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
+            BaseEntity baseEntity = (BaseEntity) params;
+            if (!baseEntity.getUseDataScope()) {
+                return;
+            }
+        }
         // 获取当前的用户
         LoginUser loginUser = SecurityUtils.getLoginUser();
         if (StringUtils.isNotNull(loginUser))

--
Gitblit v1.9.3