Merge remote-tracking branch 'origin/20210223' into 20210223

sms_water/src/main/java/com/huaxu/controller/RevenueController.java

@@ -248,7 +248,9 @@ public class RevenueController {
         List<MonthRevenueDto> result = revenueService.selectList(monthRevenueDto);
         Pagination<MonthRevenueDto> pages = new Pagination<>();
         pages.setTotal(result.size());
-        pages.setList(result.size()>0?result.subList((pageNum-1)*pageSize,pageNum*pageSize):null);
+        if((pageNum-1)*pageSize<result.size()){
+            pages.setList(result.subList((pageNum-1)*pageSize,pageNum*pageSize<result.size()?pageNum*pageSize:result.size()));
+        }
         return new AjaxMessage<>(ResultStatus.OK, pages);
     }
     /**