|
|
@@ -145,8 +145,12 @@ public class DataScopeAspect
|
|
145
|
145
|
|
|
146
|
146
|
if (StringUtils.isNotBlank(sqlString.toString()))
|
|
147
|
147
|
{
|
|
148
|
|
- BaseEntity baseEntity = (BaseEntity) joinPoint.getArgs()[0];
|
|
149
|
|
- baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
|
|
|
148
|
+ Object params = joinPoint.getArgs()[0];
|
|
|
149
|
+ if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
|
|
|
150
|
+ {
|
|
|
151
|
+ BaseEntity baseEntity = (BaseEntity) params;
|
|
|
152
|
+ baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
|
|
|
153
|
+ }
|
|
150
|
154
|
}
|
|
151
|
155
|
}
|
|
152
|
156
|
|