From a4edce5a93628e459f0c63071e6383383d86520c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 02 六月 2021 09:41:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index e8ef101..383f4b6 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -159,6 +159,7 @@
}
}
+ @SuppressWarnings("unchecked")
private static void putDataScope(JoinPoint joinPoint, String sql) {
Object params = joinPoint.getArgs()[0];
if (Validator.isNotNull(params)) {
@@ -167,8 +168,8 @@
baseEntity.getParams().put(DATA_SCOPE, sql);
} else {
try {
- Method getParams = params.getClass().getDeclaredMethod("getParams", null);
- Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params, null);
+ Method getParams = params.getClass().getDeclaredMethod("getParams");
+ Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params);
invoke.put(DATA_SCOPE, sql);
} catch (Exception e) {
// 鏂规硶鏈壘鍒� 涓嶅鐞�
--
Gitblit v1.9.3