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

RuoYi

2024-09-21 f185246cf6402ae498cf549d86923e20507625a0

 src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java

@@ -5,6 +5,9 @@
import java.util.Set;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import org.springframework.util.CollectionUtils;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.service.ISysMenuService;

@@ -62,14 +65,17 @@
        else

        {

            List<SysRole> roles = user.getRoles();

            if (!roles.isEmpty() && roles.size() > 1)

            if (!CollectionUtils.isEmpty(roles))

            {

                // 多角色设置permissions属性，以便数据权限匹配权限

                // 设置permissions属性，以便数据权限匹配权限

                for (SysRole role : roles)

                {

                    Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());

                    role.setPermissions(rolePerms);

                    perms.addAll(rolePerms);

                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL))

                    {

                        Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());

                        role.setPermissions(rolePerms);

                        perms.addAll(rolePerms);

                    }

                }

            }

            else