diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java index bdfacbe2e..de9b38f54 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java @@ -178,11 +178,15 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { // 剩余需要查询的数量 int zeroTotal = Convert.toInt(pageSize - total); double div = NumberUtil.div(zeroTotal, size.doubleValue()); - long zeroCurrent = (int) Math.ceil(div) + 1; + long zeroCurrent = (int) Math.ceil(div); int zeroSize = zeroTotal % size; IPage page1 = Condition.getPage(query); page1.setCurrent(zeroCurrent); - page1.setSize(zeroSize); + if (ObjectUtil.equals(zeroCurrent, 1)) { + page1.setSize(zeroSize); + } else { + page1.setSize(size); + } List zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper); detailsPage.addAll(zeroPage); }