|
|
@@ -1177,9 +1177,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
|
|
|
list.add(houseNumber2);
|
|
|
}
|
|
|
}
|
|
|
+ ArrayList<RoomChangePageVo> vos = new ArrayList<>();
|
|
|
+ for (House house : houses) {
|
|
|
+ RoomChangePageVo vo = new RoomChangePageVo();
|
|
|
+ String hoId = house.getId()+"";
|
|
|
|
|
|
+ List<HouseNumberVo> datas = list.stream().filter(e -> e.getHouseId().equals(hoId)).collect(Collectors.toList());
|
|
|
+ vo.setName(house.getRoomName());
|
|
|
+ vo.setChildren(datas);
|
|
|
+ vos.add(vo);
|
|
|
+ }
|
|
|
|
|
|
- return CommonResult.ok(list);
|
|
|
+ return CommonResult.ok(vos);
|
|
|
}
|
|
|
|
|
|
@Override
|