修改车辆代码

b2a38952 · 周健威 · baa60ddd · b2a38952
Commit b2a38952 authored Oct 23, 2019 by 周健威
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

VehicleModelHolidayPriceBiz.java ...xfc/platform/vehicle/biz/VehicleModelHolidayPriceBiz.java +1 -1

No files found.
--- a/xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelHolidayPriceBiz.java
+++ b/xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelHolidayPriceBiz.java
@@ -164,7 +164,7 @@ public class VehicleModelHolidayPriceBiz extends BaseBiz<VehicleModelHolidayPric
        for (VehicleModelHolidayPrice modelHolidayPrice : modelHolidayPrices) {
            vehicleModelHolidayPriceDTO = new VehicleModelHolidayPriceDTO();
            BeanUtils.copyProperties(modelHolidayPrice, vehicleModelHolidayPriceDTO);
-            vehicleModelHolidayPriceDTO.setFestival(festivalMap==null?"":festivalMap.get(modelHolidayPrice.getFestivalId()).getName());
+            vehicleModelHolidayPriceDTO.setFestival((festivalMap==null || festivalMap.size() == 0)?"":festivalMap.get(modelHolidayPrice.getFestivalId()).getName());
            vehicleModelHolidayPriceDTOS.add(vehicleModelHolidayPriceDTO);
        }
        return vehicleModelHolidayPriceDTOS;