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

RuoYi

2024-09-21 75f3275e15bc2e195e2cd4901de7d171c3675b62

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -6,6 +6,8 @@
import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Service;

import org.springframework.util.CollectionUtils;

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

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

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

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

import com.ruoyi.system.service.ISysMenuService;

@@ -71,9 +73,12 @@
                // 多角色设置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