From 842c0049ea8498ea4adb3ca119157561b4d7df4f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:37 +0800
Subject: [PATCH] 2025-12-08 zwy 整理设备属性设置无人机不在线时返回前端错误提示代码为自定义代码，设备已离线和机场代码共用一个，无法区分机场和无人机设备。
---
ard-framework/src/main/java/com/ard/framework/aspectj/DataScopeAspect.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 67f514d..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
@@ -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