diff --git a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java index bd24f73f09..c4ef77c5fd 100644 --- a/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java +++ b/core/core-backend/src/main/java/io/dataease/exportCenter/manage/ExportCenterManage.java @@ -94,7 +94,7 @@ public class ExportCenterManage { @Value("${dataease.export.max.size:10}") private int max; - @Value("${dataease.export.dataset.limit:20}") + @Value("${dataease.export.dataset.limit:100000}") private int limit; private final static String DATA_URL_TITLE = "data:image/jpeg;base64,"; private static final String exportData_path = "/opt/dataease2.0/data/exportData/"; @@ -424,9 +424,10 @@ public class ExportCenterManage { Workbook wb = new SXSSFWorkbook(); FileOutputStream fileOutputStream = new FileOutputStream(dataPath + "/" + request.getFilename() + ".xlsx"); Sheet detailsSheet = wb.createSheet("数据"); + List> details = new ArrayList<>(); for (Integer p = 0; p < totalPage; p++) { - String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, p * extractPageSize, p * extractPageSize + extractPageSize); + String querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, p * extractPageSize + extractPageSize, extractPageSize); if (totalPage == 1) { querySQL = SQLProvider.createQuerySQLWithLimit(sqlMeta, false, needOrder, false, 0, totalCount.intValue()); } @@ -448,7 +449,7 @@ public class ExportCenterManage { for (DatasetTableFieldDTO field : allFields) { header.add(field.getName()); } - List> details = new ArrayList<>(); + details.add(header); for (Map obj : data) { List row = new ArrayList<>(); @@ -477,7 +478,7 @@ public class ExportCenterManage { } } } else { - List> details = new ArrayList<>(); + details.clear(); for (Map obj : data) { List row = new ArrayList<>(); for (DatasetTableFieldDTO field : allFields) {