From b91a14d417118333cca46e8a363ee3b084c86c71 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 8 Nov 2022 17:05:36 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A1=A8=E6=A0=BC=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index df92e26e01..2cafbeb0e6 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -939,8 +939,12 @@ public class ChartViewService { querySql = qp.getSQLAsTmp(sql, xAxis, yAxis, fieldCustomFilter, rowPermissionsTree, extFilterList, view); } } - datasourceRequest.setQuery(totalPageSql); - totalPage = Long.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0]); + if (StringUtils.isNotEmpty(totalPageSql)) { + datasourceRequest.setQuery(totalPageSql); + totalPage = Long.valueOf(datasourceProvider.getData(datasourceRequest).get(0)[0]); + totalPage = totalPage / pageInfo.getPageSize() + totalPage % pageInfo.getPageSize() > 0 ? 1 : 0; + } + datasourceRequest.setQuery(querySql); data = datasourceProvider.getData(datasourceRequest); if (CollectionUtils.isNotEmpty(assistFields)) {