Browse Source

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

newMaster
RuoYi 3 years ago
parent
commit
aff54ab5fe
  1. 1
      ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java
  2. 2
      ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java

1
ruoyi-common/src/main/java/com/ruoyi/common/exception/GlobalException.java

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

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

@ -92,7 +92,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;
}

Loading…
Cancel
Save