From ae144f4279913c7d14c794e5700a9371122bdc13 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 4 Dec 2024 23:56:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AF=BC=E5=87=BA=E9=99=90?= =?UTF-8?q?=E5=88=B6=E8=A7=84=E5=88=99=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/server/ChartDataServer.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 0fde493ec5..6bf3748895 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -116,16 +116,12 @@ public class ChartDataServer implements ChartDataApi { } int curLimit = Math.toIntExact(ExportCenterUtils.getExportLimit("view")); int curDsLimit = Math.toIntExact(ExportCenterUtils.getExportLimit("dataset")); + int viewLimit = Math.min(curLimit, curDsLimit); if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) { Integer limitCount = viewDTO.getResultCount(); - viewDTO.setResultCount(Math.min(curLimit, limitCount)); + viewDTO.setResultCount(Math.min(viewLimit, limitCount)); } else { - // 普通导出取图表限制 原始明细导出时 取图表和数据集限制最小的值 - if("dataset".equals(request.getDownloadType())){ - viewDTO.setResultCount(Math.min(curLimit,curDsLimit)); - }else{ - viewDTO.setResultCount(curLimit); - } + viewDTO.setResultCount(viewLimit); } chartViewInfo = getData(viewDTO); List tableRow = (List) chartViewInfo.getData().get("sourceData");