|
@@ -204,7 +204,11 @@ public class SysUserController extends BaseController {
|
|
|
if (StringUtils.isNotNull(id)) {
|
|
|
SysUser sysUser = userService.selectUserById(id);
|
|
|
ajax.put(AjaxResult.DATA_TAG, sysUser);
|
|
|
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
|
|
|
+ if (SysUser.isAdmin(id)){
|
|
|
+ ajax.put("roleIds", roles.stream().map(SysRole::getRoleId).collect(Collectors.toList()));
|
|
|
+ }else {
|
|
|
+ ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
}
|
|
|
return ajax;
|
|
|
}
|