update 优化 不传用户id不校验数据权限
This commit is contained in:
parent
8c0441b91a
commit
7d856b030b
@ -128,13 +128,9 @@ public class SysUserController extends BaseController {
|
|||||||
@SaCheckPermission("system:user:query")
|
@SaCheckPermission("system:user:query")
|
||||||
@GetMapping(value = {"/", "/{userId}"})
|
@GetMapping(value = {"/", "/{userId}"})
|
||||||
public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
public R<SysUserInfoVo> getInfo(@PathVariable(value = "userId", required = false) Long userId) {
|
||||||
userService.checkUserDataScope(userId);
|
|
||||||
SysUserInfoVo userInfoVo = new SysUserInfoVo();
|
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)) {
|
if (ObjectUtil.isNotNull(userId)) {
|
||||||
|
userService.checkUserDataScope(userId);
|
||||||
SysUserVo sysUser = userService.selectUserById(userId);
|
SysUserVo sysUser = userService.selectUserById(userId);
|
||||||
userInfoVo.setUser(sysUser);
|
userInfoVo.setUser(sysUser);
|
||||||
userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
|
userInfoVo.setRoleIds(roleService.selectRoleListByUserId(userId));
|
||||||
@ -146,6 +142,10 @@ public class SysUserController extends BaseController {
|
|||||||
userInfoVo.setPostIds(postService.selectPostListByUserId(userId));
|
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);
|
return R.ok(userInfoVo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user