From f23efcba1bbbb84b603403711df00af138bdf3da Mon Sep 17 00:00:00 2001
From: 18582019636 <1657978663@qq.com>
Date: 星期三, 26 六月 2024 17:41:15 +0800
Subject: [PATCH] feat: 代码初始化
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index cc075f5..1e17891 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/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();
--
Gitblit v1.7.1