hjl
2024-07-01 03c6572c7918beaa20365e69c9694a11f0d9948a
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -126,12 +126,13 @@
            return R.fail("用户名或密码错误");
        }
        // 角色集合
        String roles = permissionService.getRolePermission(sysUser);
        SysRole roles = permissionService.getRolePermission(sysUser);
        // 权限集合
        Set<String> permissions = permissionService.getMenuPermission(sysUser);
        LoginUser sysUserVo = new LoginUser();
        sysUserVo.setSysUser(sysUser);
        sysUserVo.setRole(roles);
        sysUserVo.setRole(roles.getRoleName());
        sysUserVo.setRoleId(roles.getRoleId());
        sysUserVo.setPermissions(permissions);
        return R.ok(sysUserVo);
    }
@@ -145,7 +146,7 @@
    public AjaxResult getInfo() {
        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
        // 角色集合
        String roles = permissionService.getRolePermission(user);
        SysRole roles = permissionService.getRolePermission(user);
        // 权限集合
        Set<String> permissions = permissionService.getMenuPermission(user);
        AjaxResult ajax = AjaxResult.success();