优化代码生成主子表关联查询方式

RuoYi

2024-06-02 b21d5faebba533a7d0fe276c97d47a11178178f6

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

@@ -1,9 +1,12 @@
package com.ruoyi.framework.security.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.project.system.domain.SysRole;

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

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

import com.ruoyi.project.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;

    }