Skip to content

Commit e3bb870

Browse files
committed
bugfix: Fix Potential Row Misalignment or Data Corruption When Using Fill for Empty Data
1 parent 4fb2e07 commit e3bb870

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

fastexcel-core/src/main/java/cn/idev/excel/write/executor/ExcelWriteFillExecutor.java

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import cn.idev.excel.util.FieldUtils;
2424
import cn.idev.excel.util.ListUtils;
2525
import cn.idev.excel.util.MapUtils;
26+
import cn.idev.excel.util.PoiUtils;
2627
import cn.idev.excel.util.StringUtils;
2728
import cn.idev.excel.util.WriteHandlerUtils;
2829
import cn.idev.excel.write.handler.context.CellWriteHandlerContext;
@@ -31,15 +32,11 @@
3132
import cn.idev.excel.write.metadata.fill.FillConfig;
3233
import cn.idev.excel.write.metadata.fill.FillWrapper;
3334
import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
34-
3535
import lombok.AllArgsConstructor;
3636
import lombok.EqualsAndHashCode;
3737
import lombok.Getter;
3838
import lombok.Setter;
3939
import org.apache.commons.collections4.CollectionUtils;
40-
41-
import cn.idev.excel.util.PoiUtils;
42-
4340
import org.apache.poi.ss.usermodel.Cell;
4441
import org.apache.poi.ss.usermodel.CellStyle;
4542
import org.apache.poi.ss.usermodel.CellType;
@@ -212,10 +209,10 @@ private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, Fill
212209

213210
if (analysisCell.getOnlyOneVariable()) {
214211
String variable = analysisCell.getVariableList().get(0);
215-
if (!dataKeySet.contains(variable)) {
216-
continue;
212+
Object value = null;
213+
if (dataKeySet.contains(variable)) {
214+
value = dataMap.get(variable);
217215
}
218-
Object value = dataMap.get(variable);
219216
ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
220217
writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
221218
writeContext.currentWriteHolder());

0 commit comments

Comments
 (0)