优化代码

RuoYi

2023-07-06 4d5c204b9aa4b8ba0e42d20a73f5bd3de9ed73d2

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

@@ -1,9 +1,12 @@
package com.ruoyi.framework.web.service;



import java.util.HashSet;

import java.util.List;

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.core.domain.entity.SysRole;

import com.ruoyi.common.core.domain.entity.SysUser;

import com.ruoyi.system.service.ISysMenuService;

import com.ruoyi.system.service.ISysRoleService;

@@ -59,7 +62,21 @@
        }

        else

        {

            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

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

            if (!CollectionUtils.isEmpty(roles))

            {

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

                for (SysRole role : roles)

                {

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

                    role.setPermissions(rolePerms);

                    perms.addAll(rolePerms);

                }

            }

            else

            {

                perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

            }

        }

        return perms;

    }