Browse Source

修复填充数据不能为空的问题 [Issue #1703]

developing
Jiaju Zhuang 3 years ago
parent
commit
b7ef6e8dc3
  1. 2
      src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
  2. 1
      update.md

2
src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

@ -178,7 +178,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, FillConfig fillConfig, private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, FillConfig fillConfig,
Integer relativeRowIndex) { Integer relativeRowIndex) {
if (CollectionUtils.isEmpty(analysisCellList)) { if (CollectionUtils.isEmpty(analysisCellList) || oneRowData == null) {
return; return;
} }
Map<?, ?> dataMap; Map<?, ?> dataMap;

1
update.md

@ -29,6 +29,7 @@
* 修复忽略字段后可能排序不一致的问题 * 修复忽略字段后可能排序不一致的问题
* 修改填充时,无法使用生成的模板 [Issue #1552](https://github.com/alibaba/easyexcel/issues/1552) * 修改填充时,无法使用生成的模板 [Issue #1552](https://github.com/alibaba/easyexcel/issues/1552)
* 修改填充可以不自动继承样式 [Issue #1710](https://github.com/alibaba/easyexcel/issues/1710) * 修改填充可以不自动继承样式 [Issue #1710](https://github.com/alibaba/easyexcel/issues/1710)
* 修复填充数据不能为空的问题 [Issue #1703](https://github.com/alibaba/easyexcel/issues/1703)
# 2.2.11 # 2.2.11

Loading…
Cancel
Save