更新:获取用户信息时,角色问题。
This commit is contained in:
@@ -5,6 +5,7 @@ import java.util.Set;
|
||||
|
||||
import com.alibaba.fastjson2.JSONObject;
|
||||
import com.ruoyi.cms.domain.IDCardInfo;
|
||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwTokenResult;
|
||||
import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwUserLogin;
|
||||
import com.ruoyi.common.core.domain.model.RegisterBody;
|
||||
@@ -156,12 +157,13 @@ public class SysLoginController
|
||||
*
|
||||
* @return 用户信息
|
||||
*/
|
||||
@GetMapping("getInfo")
|
||||
@GetMapping("/getInfo")
|
||||
public AjaxResult getInfo()
|
||||
{
|
||||
SysUser user = SecurityUtils.getLoginUser().getUser();
|
||||
// 角色集合
|
||||
Set<String> roles = permissionService.getRolePermission(user);
|
||||
// Set<String> roles = permissionService.getRolePermission(user);
|
||||
Set<SysRole> roles = permissionService.getSysRolePermission(user);
|
||||
// 权限集合
|
||||
Set<String> permissions = permissionService.getMenuPermission(user);
|
||||
AjaxResult ajax = AjaxResult.success();
|
||||
|
||||
@@ -46,6 +46,20 @@ public class SysPermissionService
|
||||
return roles;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取角色数据权限
|
||||
*
|
||||
* @param user 用户信息
|
||||
* @return 角色权限信息
|
||||
*/
|
||||
public Set<SysRole> getSysRolePermission(SysUser user)
|
||||
{
|
||||
Set<SysRole> roles = new HashSet<SysRole>();
|
||||
List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId());
|
||||
roles.addAll(roleList);
|
||||
return roles;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取菜单数据权限
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user