Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
This commit is contained in:
commit
8d6c9e116d
|
@ -145,17 +145,7 @@ public class DataScopeAspect
|
|||
|
||||
if (StrUtil.isNotBlank(sqlString.toString()))
|
||||
{
|
||||
Object params = joinPoint.getArgs()[0];
|
||||
if (Validator.isNotNull(params))
|
||||
{
|
||||
try {
|
||||
Method getParams = params.getClass().getDeclaredMethod("getParams", null);
|
||||
Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params, null);
|
||||
invoke.put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
putDataScope(joinPoint, " AND (" + sqlString.substring(4) + ")");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -181,10 +171,23 @@ public class DataScopeAspect
|
|||
private void clearDataScope(final JoinPoint joinPoint)
|
||||
{
|
||||
Object params = joinPoint.getArgs()[0];
|
||||
if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
|
||||
if (Validator.isNotNull(params))
|
||||
{
|
||||
BaseEntity baseEntity = (BaseEntity) params;
|
||||
baseEntity.getParams().put(DATA_SCOPE, "");
|
||||
putDataScope(joinPoint, "");
|
||||
}
|
||||
}
|
||||
|
||||
private static void putDataScope(JoinPoint joinPoint, String sql) {
|
||||
Object params = joinPoint.getArgs()[0];
|
||||
if (Validator.isNotNull(params))
|
||||
{
|
||||
try {
|
||||
Method getParams = params.getClass().getDeclaredMethod("getParams", null);
|
||||
Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params, null);
|
||||
invoke.put(DATA_SCOPE, sql);
|
||||
} catch (Exception e) {
|
||||
// 方法未找到 不处理
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue