From 23b688e436a89845e92d861adb5875e625e90d9f Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 14 三月 2025 11:43:18 +0800
Subject: [PATCH] Merge branch 'dev'
---
system/src/main/java/com/ycl/framework/aspectj/DataScopeAspect.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/system/src/main/java/com/ycl/framework/aspectj/DataScopeAspect.java b/system/src/main/java/com/ycl/framework/aspectj/DataScopeAspect.java
index 8ae1e70..7c9cf60 100644
--- a/system/src/main/java/com/ycl/framework/aspectj/DataScopeAspect.java
+++ b/system/src/main/java/com/ycl/framework/aspectj/DataScopeAspect.java
@@ -2,6 +2,8 @@
import java.util.ArrayList;
import java.util.List;
+
+import com.ycl.system.domain.base.AbsQuery;
import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
@@ -151,10 +153,12 @@
if (StringUtils.isNotBlank(sqlString.toString()))
{
Object params = joinPoint.getArgs()[0];
- if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
- {
+ if (StringUtils.isNotNull(params) && params instanceof BaseEntity) {
BaseEntity baseEntity = (BaseEntity) params;
baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ } else if (StringUtils.isNotNull(params) && params instanceof AbsQuery) {
+ AbsQuery query = (AbsQuery) params;
+ query.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
}
}
}
--
Gitblit v1.8.0