diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java index 5cb86cd..d21038c 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/ExcelExportUtil.java @@ -55,7 +55,7 @@ public class ExcelExportUtil { Workbook workbook; if (ExcelType.HSSF.equals(entity.getType())) { workbook = new HSSFWorkbook(); - } else if (dataSet.size() < 1000) { + } else if (dataSet.size() < 10000) { workbook = new XSSFWorkbook(); } else { workbook = new SXSSFWorkbook(); @@ -78,7 +78,7 @@ public class ExcelExportUtil { Workbook workbook; if (ExcelType.HSSF.equals(entity.getType())) { workbook = new HSSFWorkbook(); - } else if (dataSet.size() < 1000) { + } else if (dataSet.size() < 10000) { workbook = new XSSFWorkbook(); } else { workbook = new SXSSFWorkbook(); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 88a4d31..eda8460 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -153,6 +153,12 @@ public class ExcelExportServer extends ExcelExportBase { // 重复遍历,出现了重名现象,创建非指定的名称Sheet sheet = workbook.createSheet(); } + insertDataToSheet(workbook, entity, entityList, dataSet,sheet); + } + + private void insertDataToSheet(Workbook workbook, ExportParams entity, + List entityList, Collection dataSet, + Sheet sheet) { try { dataHanlder = entity.getDataHanlder(); if (dataHanlder != null && dataHanlder.getNeedHandlerFields() != null) {