修改填充可能填充错误的bug #2035

src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java

@@ -199,7 +199,8 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
                     continue;
                 }
                 Object value = dataMap.get(variable);
-                WriteCellData<?> cellData = converterAndSet(writeSheetHolder, FieldUtils.getFieldClass(dataMap, variable),
+                WriteCellData<?> cellData = converterAndSet(writeSheetHolder,
+                    FieldUtils.getFieldClass(dataMap, variable),
                     null, cell, value, fieldNameContentPropertyMap.get(variable), null, relativeRowIndex);
                 WriteHandlerUtils.afterCellDispose(writeContext, cellData, cell, null, relativeRowIndex, Boolean.FALSE);
             } else {
@@ -416,7 +417,6 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         int startIndex = 0;
         int length = value.length();
         int lastPrepareDataIndex = 0;
-        int variableCount = 0;
         out:
         while (startIndex < length) {
             int prefixIndex = value.indexOf(FILL_PREFIX, startIndex);
@@ -448,10 +448,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             String variable = value.substring(prefixIndex + 1, suffixIndex);
             if (StringUtils.isEmpty(variable)) {
                 continue;
-            } else {
-                ++variableCount;
             }
-
             int collectPrefixIndex = variable.indexOf(COLLECTION_PREFIX);
             if (collectPrefixIndex > -1) {
                 if (collectPrefixIndex != 0) {
@@ -466,18 +463,19 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             analysisCell.getVariableList().add(variable);
             if (lastPrepareDataIndex == prefixIndex) {
                 analysisCell.getPrepareDataList().add(StringUtils.EMPTY);
+                // fix https://github.com/alibaba/easyexcel/issues/2035
+                if (lastPrepareDataIndex != 0) {
+                    analysisCell.setOnlyOneVariable(Boolean.FALSE);
+                }
             } else {
                 String data = convertPrepareData(value.substring(lastPrepareDataIndex, prefixIndex));
                 preparedData.append(data);
                 analysisCell.getPrepareDataList().add(data);
+                analysisCell.setOnlyOneVariable(Boolean.FALSE);
             }
             lastPrepareDataIndex = suffixIndex + 1;
         }
 
-        if (variableCount > 1) {
-            analysisCell.setOnlyOneVariable(Boolean.FALSE);
-        }
-
         return dealAnalysisCell(analysisCell, value, rowIndex, lastPrepareDataIndex, length, firstRowCache,
             preparedData);
     }

update.md

@@ -16,6 +16,7 @@
 * 写入支持Collection [Issue #1834](https://github.com/alibaba/easyexcel/issues/1834)
 * `Converter`支持null转换 [Issue #1776](https://github.com/alibaba/easyexcel/issues/1776)
 * cglib 新增命名策略，防止和`spring`的冲突  [Issue #2064](https://github.com/alibaba/easyexcel/issues/2064)
+* 修改填充可能填充错误的bug  [Issue #2035](https://github.com/alibaba/easyexcel/issues/2035)
 
 # 2.2.10
 * 修复读取的时候用string接收数字 可能四舍五入不一致的bug