qh лет назад: 2
Родитель
Сommit
7f50874419

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

@@ -290,7 +290,7 @@ public class CesRoomsServiceImpl extends ServiceImpl<CesRoomsMapper, CesRooms> i
            hourPrice = hourRoomRule.getAfterOpenRoomPay();
         }
         BigDecimal finalHourPrice = hourPrice;
-        List<CesRooms> choiceRooms = null;
+        List<CesRooms> choiceRooms = new ArrayList<>();
         if(param.getOrderId() != null && !param.getOrderId().isEmpty()) {
             List<BusBookingRooms> bookingRooms = bookingRoomsService.list(Wrappers.<BusBookingRooms>query().eq("booking_orders_id",param.getOrderId()));
             List<String> choiceRoomIds = bookingRooms.stream().map(w->w.getRoomId()).collect(Collectors.toList());