@@ -112,9 +112,13 @@ public class ExcelExportServer extends ExcelExportBase { | |||||
} | } | ||||
try { | try { | ||||
List<ExcelExportEntity> excelParams = new ArrayList<ExcelExportEntity>(); | List<ExcelExportEntity> excelParams = new ArrayList<ExcelExportEntity>(); | ||||
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); | Field fileds[] = PoiPublicUtil.getClassFields(pojoClass); | ||||
ExcelTarget etarget = pojoClass.getAnnotation(ExcelTarget.class); | ExcelTarget etarget = pojoClass.getAnnotation(ExcelTarget.class); | ||||
@@ -107,7 +107,8 @@ public abstract class ExcelExportBase extends ExportBase { | |||||
maxHeight = list.size(); | maxHeight = list.size(); | ||||
} | } | ||||
} else { | } else { | ||||
Object value = getCellValue(entity, t); | |||||
Object value = getCellValue(entity, t); | |||||
if (entity.getType() == BaseEntityTypeConstants.StringType) { | if (entity.getType() == BaseEntityTypeConstants.StringType) { | ||||
createStringCell(row, cellNum++, value == null ? "" : value.toString(), | createStringCell(row, cellNum++, value == null ? "" : value.toString(), | ||||
index % 2 == 0 ? getStyles(false, entity) : getStyles(true, entity), | index % 2 == 0 ? getStyles(false, entity) : getStyles(true, entity), | ||||