From d77a6c49d0cb77a08e99d68a08dd537896d67897 Mon Sep 17 00:00:00 2001 From: jueyue Date: Fri, 26 Jan 2018 09:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/export/template/ExcelExportOfTemplateUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java index dc41ce8..98c10d3 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -632,7 +632,7 @@ public final class ExcelExportOfTemplateUtil extends BaseExportService { //保存col 的开始列 int startIndex = cell.getColumnIndex(); Row row = cell.getRow(); - while (true) { + while (index < row.getLastCellNum()) { int colSpan = columns.get(columns.size() - 1) != null ? columns.get(columns.size() - 1).getColspan() : 1; index += colSpan;