|
@@ -118,13 +118,15 @@ public class SysUserController extends BaseController {
|
|
|
} else {
|
|
|
longs = iSysRoleService.selectRoleListByUserId(o.getId());
|
|
|
}
|
|
|
- Long[] objects = longs.toArray(new Long[]{});
|
|
|
- QueryWrapper<SysRole> wrapper=new QueryWrapper<>();
|
|
|
- wrapper.in("role_id", Arrays.asList(objects));
|
|
|
- List<SysRole> roles = roleService.list(wrapper);
|
|
|
- List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
|
|
|
- o.setRoleNames(collect);
|
|
|
- o.setRoleIds(objects);
|
|
|
+ if (!ObjectUtils.isEmpty(longs)) {
|
|
|
+ Long[] objects = longs.toArray(new Long[]{});
|
|
|
+ QueryWrapper<SysRole> wrapper = new QueryWrapper<>();
|
|
|
+ wrapper.in("role_id", Arrays.asList(objects));
|
|
|
+ List<SysRole> roles = roleService.list(wrapper);
|
|
|
+ List<String> collect = roles.stream().map(SysRole::getRoleName).collect(Collectors.toList());
|
|
|
+ o.setRoleNames(collect);
|
|
|
+ o.setRoleIds(objects);
|
|
|
+ }
|
|
|
return o;
|
|
|
}).collect(Collectors.toList());
|
|
|
page.setRecords(dto1);
|