其他用水修改

sms_water/src/main/java/com/huaxu/service/impl/RevenueServiceImpl.java

@@ -54,14 +54,17 @@ public class RevenueServiceImpl implements RevenueService {
         monthSellwaterDto.setPermissonType(loginUser.getPermissonType());
         List<MonthSellwaterDto> monthSell=revenueMapper.selectMonthSell(monthSellwaterDto);
         List<MonthSellwaterDto> result=new ArrayList<>();
-        Double othersUsage=0d;
+        Double othersUsage=null;
         if(monthSell.size()>4){
             for(int i=0;i<monthSell.size();i++){
                 if(i<3){
                     result.add(monthSell.get(i));
                 } else{
-                    if(monthSell.get(i).getWaterUsage()!=null)
+                    if(monthSell.get(i).getWaterUsage()!=null&&othersUsage!=null){
                         othersUsage+=monthSell.get(i).getWaterUsage();
+                    }else if(monthSell.get(i).getWaterUsage()!=null){
+                        othersUsage=monthSell.get(i).getWaterUsage();
+                    }
                 }
             }
             monthSellwaterDto.setPropertyName("其他用水");