Commit 1af0d1665c0581ddacece8079203a2f41f3f81f9
1 parent
4e32788b
数据权限判断对象类型
Showing
1 changed file
with
6 additions
and
2 deletions
ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
| @@ -142,8 +142,12 @@ public class DataScopeAspect | @@ -142,8 +142,12 @@ public class DataScopeAspect | ||
| 142 | 142 | ||
| 143 | if (StringUtils.isNotBlank(sqlString.toString())) | 143 | if (StringUtils.isNotBlank(sqlString.toString())) |
| 144 | { | 144 | { |
| 145 | - BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0]; | ||
| 146 | - baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); | 145 | + Object params = joinPoint.getArgs()[0]; |
| 146 | + if (StringUtils.isNotNull(params) && params instanceof BaseEntity) | ||
| 147 | + { | ||
| 148 | + BaseEntity baseEntity = (BaseEntity) params; | ||
| 149 | + baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); | ||
| 150 | + } | ||
| 147 | } | 151 | } |
| 148 | } | 152 | } |
| 149 | 153 |