From 1b0690805c45085638a06adc7f54777b3dd81b1d Mon Sep 17 00:00:00 2001 From: Hulk Date: Thu, 19 Sep 2019 15:41:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easypoi/excel/export/base/BaseExportService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java index 1e28825..ec1e52e 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/base/BaseExportService.java @@ -69,7 +69,10 @@ public abstract class BaseExportService extends ExportCommonService { int maxHeight = 1, listMaxHeight = 1; // 合并需要合并的单元格 int margeCellNum = cellNum; - int indexKey = createIndexCell(row, index, excelParams.get(0)); + int indexKey = 0; + if (excelParams != null && !excelParams.isEmpty()){ + indexKey = createIndexCell(row, index, excelParams.get(0)); + } cellNum += indexKey; for (int k = indexKey, paramSize = excelParams.size(); k < paramSize; k++) { entity = excelParams.get(k);