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),