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

@@ -7,7 +7,6 @@ package com.ruoyi.common.exception;
  */
  */
 public class GlobalException extends RuntimeException
 public class GlobalException extends RuntimeException
 {
 {
-
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**

@@ -92,7 +92,7 @@ public class DataScopeAspect
         for (SysRole role : user.getRoles())
         for (SysRole role : user.getRoles())
         {
         {
             String dataScope = role.getDataScope();
             String dataScope = role.getDataScope();
-            if (conditions.contains(dataScope))
+            if (!DATA_SCOPE_CUSTOM.equals(dataScope) && conditions.contains(dataScope))
             {
             {
                 continue;
                 continue;
             }
             }