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

alibaba · Sep 17, 2021 · b7ef6e8 · b7ef6e8
1 parent 234fc2d
commit b7ef6e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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 @@ private void increaseRowIndex(Map<String, List<AnalysisCell>> templateAnalysisCa
 
     private void doFill(List<AnalysisCell> 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
@@ -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