浏览代码

数据权限判断参数类型

RuoYi 4 年之前
父节点
当前提交
3dc4cb78e5
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

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

@@ -139,8 +139,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) + ")");
+            }
         }
     }