正在显示
1 个修改的文件
包含
4 行增加
和
4 行删除
| @@ -101,18 +101,18 @@ public class SysUserController extends BaseController | @@ -101,18 +101,18 @@ public class SysUserController extends BaseController | ||
| 101 | @GetMapping(value = { "/", "/{userId}" }) | 101 | @GetMapping(value = { "/", "/{userId}" }) |
| 102 | public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) | 102 | public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) |
| 103 | { | 103 | { |
| 104 | - userService.checkUserDataScope(userId); | ||
| 105 | AjaxResult ajax = AjaxResult.success(); | 104 | AjaxResult ajax = AjaxResult.success(); |
| 106 | - List<SysRole> roles = roleService.selectRoleAll(); | ||
| 107 | - ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); | ||
| 108 | - ajax.put("posts", postService.selectPostAll()); | ||
| 109 | if (StringUtils.isNotNull(userId)) | 105 | if (StringUtils.isNotNull(userId)) |
| 110 | { | 106 | { |
| 107 | + userService.checkUserDataScope(userId); | ||
| 111 | SysUser sysUser = userService.selectUserById(userId); | 108 | SysUser sysUser = userService.selectUserById(userId); |
| 112 | ajax.put(AjaxResult.DATA_TAG, sysUser); | 109 | ajax.put(AjaxResult.DATA_TAG, sysUser); |
| 113 | ajax.put("postIds", postService.selectPostListByUserId(userId)); | 110 | ajax.put("postIds", postService.selectPostListByUserId(userId)); |
| 114 | ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); | 111 | ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList())); |
| 115 | } | 112 | } |
| 113 | + List<SysRole> roles = roleService.selectRoleAll(); | ||
| 114 | + ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())); | ||
| 115 | + ajax.put("posts", postService.selectPostAll()); | ||
| 116 | return ajax; | 116 | return ajax; |
| 117 | } | 117 | } |
| 118 | 118 |
-
请 注册 或 登录 后发表评论