|
@@ -128,13 +128,9 @@ public class SysUserController extends BaseController {
|
|
|
@SaCheckPermission("system:user:query")
|
|
|
@GetMapping(value = {"/", "/{userId}"})
|
|
|
public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
|
|
- userService.checkUserDataScope(userId);
|
|
|
SysUserInfoVo userInfoVo = new SysUserInfoVo();
|
|
|
- SysRoleBo roleBo = new SysRoleBo();
|
|
|
- roleBo.setStatus(UserConstants.ROLE_NORMAL);
|
|
|
- List<SysRoleVo> roles = roleService.selectRoleList(roleBo);
|
|
|
- userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
|
|
|
if (ObjectUtil.isNotNull(userId)) {
|
|
|
+ userService.checkUserDataScope(userId);
|
|
|
SysUserVo sysUser = userService.selectUserById(userId);
|
|
|
userInfoVo.setUser(sysUser);
|
|
|
userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
|
|
@@ -146,6 +142,10 @@ public class SysUserController extends BaseController {
|
|
|
userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
|
|
|
}
|
|
|
}
|
|
|
+ SysRoleBo roleBo = new SysRoleBo();
|
|
|
+ roleBo.setStatus(UserConstants.ROLE_NORMAL);
|
|
|
+ List<SysRoleVo> roles = roleService.selectRoleList(roleBo);
|
|
|
+ userInfoVo.setRoles(LoginHelper.isSuperAdmin(userId) ? roles : StreamUtils.filter(roles, r -> !r.isSuperAdmin()));
|
|
|
return R.ok(userInfoVo);
|
|
|
}
|
|
|
|