Merge f2d36b141a into aae9c61ab6

easyexcel-core/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

@@ -245,11 +245,15 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
                 createCell(analysisCell, fillConfig, cellWriteHandlerContext, rowWriteHandlerContext);
                 Cell cell = cellWriteHandlerContext.getCell();
 
+                boolean skipAll = true;
                 for (String variable : analysisCell.getVariableList()) {
                     cellValueBuild.append(analysisCell.getPrepareDataList().get(index++));
                     if (!dataKeySet.contains(variable)) {
                         continue;
                     }
+                    if (skipAll) {
+                        skipAll = false;
+                    }
                     Object value = dataMap.get(variable);
                     ExcelContentProperty excelContentProperty = ClassUtils.declaredExcelContentProperty(dataMap,
                         writeContext.currentWriteHolder().excelWriteHeadProperty().getHeadClazz(), variable,
@@ -279,6 +283,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
                         }
                     }
                 }
+                if (skipAll) {
+                    continue;
+                }
                 cellValueBuild.append(analysisCell.getPrepareDataList().get(index));
                 cell.setCellValue(cellValueBuild.toString());
                 cellWriteHandlerContext.setCellDataList(cellDataList);