Browse Source

#64:

ExcelTarget与ExcelEntity的id同时存在的时候报空指针且导出的excel内容将Exceltarget和ExcelEntity(id="A")的内容都会显示出来的问题

Task-Url: http://git.oschina.net/jueyue/easypoi/issues/64
4.1.3.A
zhuhuawu 8 years ago
parent
commit
da5fc5a8c1
2 changed files with 6 additions and 2 deletions
  1. +1
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java
  2. +5
    -1
      easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java

+ 1
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExcelExportBase.java View File

@@ -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);


+ 5
- 1
easypoi-base/src/main/java/org/jeecgframework/poi/excel/export/base/ExportBase.java View File

@@ -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();


Loading…
Cancel
Save