|
|
@@ -315,7 +315,7 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
|
|
|
// 设置完size之后添加已用房间 不影响数量
|
|
|
List<String> currentFloorRoomIds = floorRooms.stream().map(r->r.getId()).collect(Collectors.toList());
|
|
|
List<CesRooms> orderRooms = finalChoiceRooms.stream().filter(y->y.getFloorId().equals(c.getId()) && !currentFloorRoomIds.contains(y.getId())).collect(Collectors.toList());
|
|
|
- orderRooms.forEach(p->{
|
|
|
+ floorRooms.forEach(p->{
|
|
|
Optional<CesRoomLayout> opLayout = layouts.stream().filter(i->i.getId().equals(p.getLayoutId())).findFirst();
|
|
|
if(opLayout.isPresent()) {
|
|
|
CesRoomLayout roomLayout = opLayout.get();
|