房型筛选

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/rooms/service/CesRoomsServiceImpl.java

@@ -324,7 +324,7 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
                canUseRoomCount[0] += floorRooms.size();
                // 设置完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());
+               List<CesRooms> orderRooms = finalChoiceRooms.stream().filter(y->y.getFloorId().equals(c.getId()) && !currentFloorRoomIds.contains(y.getId()) && y.getLayoutId().equals(s.getId())).collect(Collectors.toList());
                floorRooms.addAll(orderRooms);
                floorRoomsVo.setFloorRooms(floorRooms);
                floorVos.add(floorRoomsVo);