数据权限判断对象类型

1af0d166 · RuoYi · 4e32788b · 1af0d166
Commit 1af0d166 authored Aug 28, 2020 by RuoYi
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java ...ain/java/com/ruoyi/framework/aspectj/DataScopeAspect.java +6 -2

No files found.
--- 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 @@ public class DataScopeAspect

        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) + ")");
+            }
        }
    }