From d4f27429fbbe0d382d60ddbf49baa73f59832470 Mon Sep 17 00:00:00 2001 From: jueyue Date: Thu, 10 Sep 2015 23:14:08 +0800 Subject: [PATCH] =?UTF-8?q?@theseawolves=20=E7=9A=84=20#28=20=E5=AF=BC?= =?UTF-8?q?=E5=85=A5excel=E5=88=97=E6=95=B0=E9=87=8F=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E6=9C=89bug=EF=BC=8C=E5=AF=BC=E8=87=B4=E6=9C=89=E4=BA=9B?= =?UTF-8?q?=E5=88=97=E6=95=B0=E6=BC=8F=E6=8E=89=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecgframework/poi/excel/imports/ExcelImportServer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 a60e3d8..3d75253 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 @@ -105,7 +105,7 @@ public class ExcelImportServer extends ImportBaseService { Object entity = PoiPublicUtil.createObject(param.getType(), targetId); String picId; boolean isUsed = false;// 是否需要加上这个对象 - for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) { + for (int i = row.getFirstCellNum(); i < param.getExcelParams().size(); i++) { Cell cell = row.getCell(i); String titleString = (String) titlemap.get(i); if (param.getExcelParams().containsKey(titleString)) { @@ -207,7 +207,7 @@ public class ExcelImportServer extends ImportBaseService { } else { object = PoiPublicUtil.createObject(pojoClass, targetId); try { - for (int i = row.getFirstCellNum(), le = row.getLastCellNum(); i < le; i++) { + for (int i = row.getFirstCellNum(), le = excelCollection.size(); i < le; i++) { Cell cell = row.getCell(i); String titleString = (String) titlemap.get(i); if (excelParams.containsKey(titleString) || Map.class.equals(pojoClass)) {