From f4536d5d2eee37e9772183f6e315033d634dfeff Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: Fri, 04 Sep 2020 14:07:47 +0800
Subject: [PATCH] !86 数据字典缓存处理的一点小问题 Merge pull request !86 from 说一/master
---
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 8 ++++++--
1 files changed, 6 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 4694947..222888c 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
@@ -142,8 +142,12 @@
if (StringUtils.isNotBlank(sqlString.toString()))
{
- BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ Object params = joinPoint.getArgs()[0];
+ if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+ {
+ BaseEntity baseEntity = (BaseEntity) params;
+ baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+ }
}
}
--
Gitblit v1.9.2