|
@@ -56,7 +56,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleDao, SysUserR
|
|
List<SysUserRolePermission> permissions = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
|
|
List<SysUserRolePermission> permissions = sysUserRolePermissionRelationDao.selectUserRolePermissionByRoleId(role_id);
|
|
roleDetail.setPermissions(permissions);
|
|
roleDetail.setPermissions(permissions);
|
|
|
|
|
|
- List<String> permission_ids = permissions.stream().map(p -> p.getId()).collect(Collectors.toList());
|
|
|
|
|
|
+ List<String> permission_ids = permissions.stream().filter(permission -> permission != null).map(p -> p.getId()).collect(Collectors.toList());
|
|
roleDetail.setPermission_ids(permission_ids);
|
|
roleDetail.setPermission_ids(permission_ids);
|
|
|
|
|
|
return roleDetail;
|
|
return roleDetail;
|