自定义数据权限不排除重复

2022-07-26 14:43:09 +08:00
parent 289161b8c6
commit 3f0a34e20f
3 changed files with 3 additions and 2 deletions
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@ -90,7 +90,7 @@ public class DataScopeAspect
        for (SysRole role : user.getRoles())
        {
            String dataScope = role.getDataScope();
-            if (conditions.contains(dataScope))
+            if (!DATA_SCOPE_CUSTOM.equals(dataScope) && conditions.contains(dataScope))
            {
                continue;
            }