Merge pull request dataease#13850 from dataease/dev-v2

ziyujiahao · web-flow · commit c69d2fae36c5 · 2024-12-04T23:59:28.000+08:00
merge
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
@@ -116,16 +116,12 @@ public ChartViewDTO findExcelData(ChartExcelRequest request) {
             }
             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<Object[]> tableRow = (List) chartViewInfo.getData().get("sourceData");
