|
@@ -65,7 +65,7 @@ public class AppPageReportServiceImpl implements AppPageReportService {
|
|
|
deviceWaterSupply.setAmount(BigDecimal.ZERO);
|
|
|
}
|
|
|
else{
|
|
|
- deviceWaterSupply.setAmount(new BigDecimal(revenue.getMeterReadingUsage()));
|
|
|
+ deviceWaterSupply.setAmount(new BigDecimal(revenue.getMeterReadingUsage()==null?0:revenue.getMeterReadingUsage()));
|
|
|
}
|
|
|
deviceWaterSupplies.add(i, deviceWaterSupply);
|
|
|
}
|