|
23 | 23 | import cn.idev.excel.util.FieldUtils;
|
24 | 24 | import cn.idev.excel.util.ListUtils;
|
25 | 25 | import cn.idev.excel.util.MapUtils;
|
| 26 | +import cn.idev.excel.util.PoiUtils; |
26 | 27 | import cn.idev.excel.util.StringUtils;
|
27 | 28 | import cn.idev.excel.util.WriteHandlerUtils;
|
28 | 29 | import cn.idev.excel.write.handler.context.CellWriteHandlerContext;
|
|
31 | 32 | import cn.idev.excel.write.metadata.fill.FillConfig;
|
32 | 33 | import cn.idev.excel.write.metadata.fill.FillWrapper;
|
33 | 34 | import cn.idev.excel.write.metadata.holder.WriteSheetHolder;
|
34 |
| - |
35 | 35 | import lombok.AllArgsConstructor;
|
36 | 36 | import lombok.EqualsAndHashCode;
|
37 | 37 | import lombok.Getter;
|
38 | 38 | import lombok.Setter;
|
39 | 39 | import org.apache.commons.collections4.CollectionUtils;
|
40 |
| - |
41 |
| -import cn.idev.excel.util.PoiUtils; |
42 |
| - |
43 | 40 | import org.apache.poi.ss.usermodel.Cell;
|
44 | 41 | import org.apache.poi.ss.usermodel.CellStyle;
|
45 | 42 | import org.apache.poi.ss.usermodel.CellType;
|
@@ -212,10 +209,10 @@ private void doFill(List<AnalysisCell> analysisCellList, Object oneRowData, Fill
|
212 | 209 |
|
213 | 210 | if (analysisCell.getOnlyOneVariable()) {
|
214 | 211 | 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); |
217 | 215 | }
|
218 |
| - Object value = dataMap.get(variable); |
219 | 216 | ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
|
220 | 217 | writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
|
221 | 218 | writeContext.currentWriteHolder());
|
|
0 commit comments