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");