optimized code

RuoYi

2023-06-30 356b451b2ad0f3e51eb5473c4d14fdfe3386ac07

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

@@ -1,15 +1,22 @@
package com.ruoyi.system.service.impl;



import java.util.HashSet;

import java.util.List;

import java.util.Set;

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

import org.springframework.stereotype.Service;



import org.springframework.util.CollectionUtils;

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

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

import com.ruoyi.system.service.ISysMenuService;

import com.ruoyi.system.service.ISysPermissionService;

import com.ruoyi.system.service.ISysRoleService;



/**

 * 用户权限处理

 * 
 * @author ruoyi

 */

@Service

public class SysPermissionServiceImpl implements ISysPermissionService

{

@@ -22,20 +29,21 @@
    /**

     * 获取角色数据权限

     * 

     * @param user 用户信息

     * @param userId 用户Id

     * @return 角色权限信息

     */

    public Set<String> getRolePermission(Long userId)

    @Override

    public Set<String> getRolePermission(SysUser user)

    {

        Set<String> roles = new HashSet<String>();

        // 管理员拥有所有权限

        if (SysUser.isAdmin(userId))

        if (user.isAdmin())

        {

            roles.add("admin");

        }

        else

        {

            roles.addAll(roleService.selectRolePermissionByUserId(userId));

            roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));

        }

        return roles;

    }

@@ -43,20 +51,35 @@
    /**

     * 获取菜单数据权限

     * 

     * @param user 用户信息

     * @param userId 用户Id

     * @return 菜单权限信息

     */

    public Set<String> getMenuPermission(Long userId)

    @Override

    public Set<String> getMenuPermission(SysUser user)

    {

        Set<String> perms = new HashSet<String>();

        // 管理员拥有所有权限

        if (SysUser.isAdmin(userId))

        if (user.isAdmin())

        {

            perms.add("*:*:*");

        }

        else

        {

            perms.addAll(menuService.selectMenuPermsByUserId(userId));

            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;

    }