From a78c62bf63b29620e999b408264d63e3ee927e14 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Wed, 10 Jul 2024 10:45:47 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E9=80=81=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/ReportDeliverServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 4526a1dff..b78b70d9d 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 @@ -179,11 +179,10 @@ public class ReportDeliverServiceImpl implements ReportDeliverService { double div = NumberUtil.div(zeroTotal, size.doubleValue()); long zeroCurrent = (int) Math.ceil(div) + 1; int zeroSize = zeroTotal % size; - page.setCurrent(zeroCurrent); - page.setSize(zeroSize); - List zeroPage = reportDeliverMapeer.getDetailsZeroPage(page, queryWrapper); - page.setCurrent(current); - page.setSize(size); + IPage page1 = Condition.getPage(query); + page1.setCurrent(zeroCurrent); + page1.setSize(zeroSize); + List zeroPage = reportDeliverMapeer.getDetailsZeroPage(page1, queryWrapper); detailsPage.addAll(zeroPage); } page.setTotal(allTotal);