修复角色禁用权限不失效问题

RuoYi

2024-09-21 75f3275e15bc2e195e2cd4901de7d171c3675b62

 ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -6,6 +6,7 @@
import org.aspectj.lang.annotation.Aspect;

import org.aspectj.lang.annotation.Before;

import org.springframework.stereotype.Component;

import com.ruoyi.common.core.constant.UserConstants;

import com.ruoyi.common.core.context.SecurityContextHolder;

import com.ruoyi.common.core.text.Convert;

import com.ruoyi.common.core.utils.StringUtils;

@@ -73,8 +74,7 @@
            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())

            {

                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),

                        controllerDataScope.userAlias(), permission);

                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);

            }

        }

    }

@@ -103,7 +103,7 @@
        for (SysRole role : user.getRoles())

        {

            String dataScope = role.getDataScope();

            if (conditions.contains(dataScope))

            if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))

            {

                continue;

            }