diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index af3f6c2420ebc38ade3c43b20df0ea5d67a97c07..e91e2834ce4ce3010c5b8c8f879087ab5d7cd19f 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -178,7 +178,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { private void doFill(List analysisCellList, Object oneRowData, FillConfig fillConfig, Integer relativeRowIndex) { - if (CollectionUtils.isEmpty(analysisCellList)) { + if (CollectionUtils.isEmpty(analysisCellList) || oneRowData == null) { return; } Map dataMap; diff --git a/update.md b/update.md index a2296684d6bd1e12fb074369392e087a3bbfa12b..b3f80f7781dacba7c5ad2bd8cc2d766c4fc4c55b 100644 --- a/update.md +++ b/update.md @@ -29,6 +29,7 @@ * 修复忽略字段后可能排序不一致的问题 * 修改填充时,无法使用生成的模板 [Issue #1552](https://github.com/alibaba/easyexcel/issues/1552) * 修改填充可以不自动继承样式 [Issue #1710](https://github.com/alibaba/easyexcel/issues/1710) +* 修复填充数据不能为空的问题 [Issue #1703](https://github.com/alibaba/easyexcel/issues/1703) # 2.2.11