!354 update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java....

若依

2021-10-25 0c30ffa11ff30882fd81302b6879f4c32ddf0b2a

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -96,6 +96,7 @@
    @GetMapping(value = { "/", "/{userId}" })

    public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)

    {

        userService.checkUserDataScope(userId);

        AjaxResult ajax = AjaxResult.success();

        List<SysRole> roles = roleService.selectRoleAll();

        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));