From 3b54157f5b77bc64a3309b97eeeb7020ac598bb6 Mon Sep 17 00:00:00 2001 From: xfworld Date: Fri, 27 May 2016 14:08:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86Index=20ADD=E7=9A=84?= =?UTF-8?q?bug,=E4=BD=86=E6=98=AF=E5=AF=B9=E4=BA=8EMerge=E7=9A=84=E7=89=B9?= =?UTF-8?q?=E6=80=A7=E6=94=AF=E6=8C=81=E8=BF=98=E5=AD=98=E5=9C=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E9=9C=80=E8=A6=81=E8=BF=9B=E4=B8=80=E6=AD=A5?= =?UTF-8?q?=E8=B7=9F=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../poi/excel/export/ExcelExportServer.java | 10 +++++++--- .../poi/excel/export/base/ExcelExportBase.java | 3 ++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java index 8a26948..c2a7ac8 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/ExcelExportServer.java @@ -112,9 +112,13 @@ public class ExcelExportServer extends ExcelExportBase { } try { List excelParams = new ArrayList(); - if (entity.isAddIndex()) { - excelParams.add(indexExcelEntity(entity)); - } + /** + * createSheetMap 中也会判断index字段,会导致重复添加,出现null 情况 + * 这里的代码注释掉 @date 2016-05-27 by xfworld + */ +// if (entity.isAddIndex()) { +// excelParams.add(indexExcelEntity(entity)); +// } // 得到所有字段 Field fileds[] = PoiPublicUtil.getClassFields(pojoClass); ExcelTarget etarget = pojoClass.getAnnotation(ExcelTarget.class); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java index 01c567b..193a34f 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java @@ -107,7 +107,8 @@ public abstract class ExcelExportBase extends ExportBase { maxHeight = list.size(); } } else { - Object value = getCellValue(entity, t); + Object value = getCellValue(entity, t); + if (entity.getType() == BaseEntityTypeConstants.StringType) { createStringCell(row, cellNum++, value == null ? "" : value.toString(), index % 2 == 0 ? getStyles(false, entity) : getStyles(true, entity),