From 0077ebe6ac131289b739d645cbbf3babc0619575 Mon Sep 17 00:00:00 2001 From: jueyue Date: Wed, 24 Jun 2015 11:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E7=89=88=E8=AE=B0=E5=BE=97?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/export/template/ExcelExportOfTemplateUtil.java | 1 + .../jeecgframework/poi/excel/imports/ExcelImportServer.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java index 6dc0c1e..d8360e5 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/template/ExcelExportOfTemplateUtil.java @@ -179,6 +179,7 @@ public final class ExcelExportOfTemplateUtil extends ExcelExportBase { && StringUtils.isNotEmpty(params.getSheetName()[i])) { wb.setSheetName(i, params.getSheetName()[i]); } + tempCreateCellSet.clear(); parseTemplate(wb.getSheetAt(i), map); } if (dataSet != null) { diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java index e115750..7ba1826 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/imports/ExcelImportServer.java @@ -249,9 +249,11 @@ public class ExcelImportServer extends ImportBaseService { String collectionName = null; ExcelCollectionParams collectionParams = null; Row row = null; - //还没想到好办法判断 for (int j = 0; j < params.getHeadRows(); j++) { row = rows.next(); + if(row == null){ + continue; + } cellTitle = row.cellIterator(); while (cellTitle.hasNext()) { Cell cell = cellTitle.next();