From da5fc5a8c191b16c27f067733dae1becd04829d0 Mon Sep 17 00:00:00 2001 From: zhuhuawu Date: Fri, 29 Jul 2016 11:11:48 +0800 Subject: [PATCH] =?UTF-8?q?#64:=20ExcelTarget=E4=B8=8EExcelEntity=E7=9A=84?= =?UTF-8?q?id=E5=90=8C=E6=97=B6=E5=AD=98=E5=9C=A8=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=8A=A5=E7=A9=BA=E6=8C=87=E9=92=88=E4=B8=94=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84excel=E5=86=85=E5=AE=B9=E5=B0=86Exceltarget?= =?UTF-8?q?=E5=92=8CExcelEntity(id=3D"A")=E7=9A=84=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E9=83=BD=E4=BC=9A=E6=98=BE=E7=A4=BA=E5=87=BA=E6=9D=A5=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-Url: http://git.oschina.net/jueyue/easypoi/issues/64 --- .../poi/excel/export/base/ExcelExportBase.java | 2 +- .../jeecgframework/poi/excel/export/base/ExportBase.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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();