|
|
@ -95,7 +95,7 @@ public class UserController { |
|
|
|
// 设置用户角色信息
|
|
|
|
// 设置用户角色信息
|
|
|
|
if (user != null) { |
|
|
|
if (user != null) { |
|
|
|
roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId())) |
|
|
|
roles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, user.getCasUserId())) |
|
|
|
.stream().map(userRole -> userRole.getRoleId()).collect(Collectors.toList()); |
|
|
|
.stream().map(UserRole::getRoleId).collect(Collectors.toList()); |
|
|
|
user.setRoleIds(ArrayUtil.toArray(roles, String.class)); |
|
|
|
user.setRoleIds(ArrayUtil.toArray(roles, String.class)); |
|
|
|
} |
|
|
|
} |
|
|
|
return R.ok(new ResultVo().setResult(user).setExtend(roleList)); |
|
|
|
return R.ok(new ResultVo().setResult(user).setExtend(roleList)); |
|
|
|