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..5e599c3 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 @@ -196,7 +196,7 @@ public abstract class ExcelExportBase extends ExportBase { } private int createIndexCell(Row row, int index, ExcelExportEntity excelExportEntity) { - if (excelExportEntity.getName().equals("序号") && excelExportEntity.getFormat() != null + if (excelExportEntity.getName()!=null&&excelExportEntity.getName().equals("序号") && excelExportEntity.getFormat() != null && excelExportEntity.getFormat().equals(PoiBaseConstants.IS_ADD_INDEX)) { createStringCell(row, 0, currentIndex + "", index % 2 == 0 ? getStyles(false, null) : getStyles(true, null), null); diff --git a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java index 10a420b..49df917 100644 --- a/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java +++ b/easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java @@ -115,7 +115,11 @@ public class ExportBase { } // 首先判断Excel 可能一下特殊数据用户回自定义处理 if (field.getAnnotation(Excel.class) != null) { - excelParams.add(createExcelExportEntity(field, targetId, pojoClass, getMethods)); + Excel excel = field.getAnnotation(Excel.class); + String name=PoiPublicUtil.getValueByTargetId(excel.name(), targetId, null); + if(StringUtils.isNotBlank(name)){ + excelParams.add(createExcelExportEntity(field, targetId, pojoClass, getMethods)); + } } else if (PoiPublicUtil.isCollection(field.getType())) { ExcelCollection excel = field.getAnnotation(ExcelCollection.class); ParameterizedType pt = (ParameterizedType) field.getGenericType();