Merge remote-tracking branch 'origin/dev' into dev

疯狂的狮子li

2021-06-02 a4edce5a93628e459f0c63071e6383383d86520c

Merge remote-tracking branch 'origin/dev' into dev

 ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

@@ -159,6 +159,7 @@
        }
    }

    @SuppressWarnings("unchecked")
    private static void putDataScope(JoinPoint joinPoint, String sql) {
        Object params = joinPoint.getArgs()[0];
        if (Validator.isNotNull(params)) {
@@ -167,8 +168,8 @@
                baseEntity.getParams().put(DATA_SCOPE, sql);
            } else {
                try {
                    Method getParams = params.getClass().getDeclaredMethod("getParams", null);
                    Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params, null);
                    Method getParams = params.getClass().getDeclaredMethod("getParams");
                    Map<String, Object> invoke = (Map<String, Object>) getParams.invoke(params);
                    invoke.put(DATA_SCOPE, sql);
                } catch (Exception e) {
                    // 方法未找到 不处理