From aff665ebb91a984068114f424172e8316538e97c Mon Sep 17 00:00:00 2001 From: jueyue Date: Mon, 10 Jun 2019 15:00:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=91=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/imports/recursive/ExcelImportForkJoinWork.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/recursive/ExcelImportForkJoinWork.java b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/recursive/ExcelImportForkJoinWork.java index 2f43bc0..76b3c36 100644 --- a/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/recursive/ExcelImportForkJoinWork.java +++ b/easypoi-base/src/main/java/cn/afterturn/easypoi/excel/imports/recursive/ExcelImportForkJoinWork.java @@ -85,6 +85,7 @@ public class ExcelImportForkJoinWork extends RecursiveTask { ExcelImportResult result = new ExcelImportResult(); result.setFailList(new ArrayList()); result.setList(new ArrayList()); + boolean isMap = Map.class.equals(pojoClass); for (int i = startRow; i <= endRow; i++) { row = sheet.getRow(i); errorMsg = new StringBuilder(); @@ -97,7 +98,7 @@ public class ExcelImportForkJoinWork extends RecursiveTask { for (Integer cn : keys) { Cell cell = row.getCell(cn); String titleString = (String) titlemap.get(cn); - if (excelParams.containsKey(titleString) || Map.class.equals(pojoClass)) { + if (excelParams.containsKey(titleString) || isMap) { try { importService.saveFieldValue(params, object, cell, excelParams, titleString, row); } catch (ExcelImportException e) { @@ -111,7 +112,7 @@ public class ExcelImportForkJoinWork extends RecursiveTask { if (object instanceof IExcelDataModel) { ((IExcelDataModel) object).setRowNum(row.getRowNum()); } - if (importService.verifyingDataValidity(object, row, params, pojoClass, errorMsg)) { + if (importService.verifyingDataValidity(object, row, params, isMap, errorMsg)) { result.getList().add(object); } else { result.getFailList().add(object);