From df22a7f67337cacc5e4ef3c94086d0e6ece854c5 Mon Sep 17 00:00:00 2001 From: phanes <5411232+phanes@user.noreply.gitee.com> Date: Sun, 21 Nov 2021 12:04:57 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=81=E8=AE=B8=E5=9C=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=85=A5=E5=8F=82=E4=B8=AD=E6=B7=BB=E5=8A=A0=20dataSc?= =?UTF-8?q?ope=20=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/framework/aspectj/DataScopeAspect.java | 9 +++------ 1 file changed, 3 insertions(+), 6 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 0c120b6a3..4dfad1c73 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 @@ -16,7 +16,6 @@ import org.aspectj.lang.annotation.Before; import org.springframework.stereotype.Component; import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; /** * 数据过滤处理 @@ -139,11 +138,9 @@ public class DataScopeAspect { BaseEntity baseEntity = (BaseEntity) params; baseEntity.getParams().put(DATA_SCOPE, sql); } else if (params instanceof Map) { - Map tempMap = (Map) params; - Map paramMap = new ConcurrentHashMap<>(tempMap.size() + 1); - tempMap.forEach((k, v) -> paramMap.put((String) k, v)); - paramMap.put(DATA_SCOPE, sql); - joinPoint.getArgs()[0] = paramMap; + @SuppressWarnings("unchecked") + Map map = (Map) params; + map.put(DATA_SCOPE, sql); } else { Map invoke = ReflectUtils.invokeGetter(params, "params"); invoke.put(DATA_SCOPE, sql);