From 0bf3e5e9a5b89d1e4ee206a81a1309d82127c346 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 17 Mar 2020 00:56:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/ExcelWriteFillExecutor.java      | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
index 03607b3..51d7d3a 100644
--- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
+++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
@@ -85,7 +85,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
 
     public void fill(Object data, FillConfig fillConfig) {
         if (data == null) {
-            data = new HashMap<String,Object>(16);
+            data = new HashMap<String, Object>(16);
         }
         if (fillConfig == null) {
             fillConfig = FillConfig.builder().build(true);
@@ -101,7 +101,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
             realData = data;
             currentDataPrefix = null;
         }
-        currentUniqueDataFlag = uniqueDataFlag(writeContext.writeSheetHolder().getSheetNo(), currentDataPrefix);
+        currentUniqueDataFlag = uniqueDataFlag(writeContext.writeSheetHolder(), currentDataPrefix);
 
         // processing data
         if (realData instanceof Collection) {
@@ -444,7 +444,6 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
 
     private String dealAnalysisCell(AnalysisCell analysisCell, String value, int rowIndex, int lastPrepareDataIndex,
         int length, Map<String, Set<Integer>> firstRowCache, StringBuilder preparedData) {
-        Integer sheetNo = writeContext.writeSheetHolder().getSheetNo();
         if (analysisCell != null) {
             if (lastPrepareDataIndex == length) {
                 analysisCell.getPrepareDataList().add(StringUtils.EMPTY);
@@ -452,7 +451,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
                 analysisCell.getPrepareDataList().add(convertPrepareData(value.substring(lastPrepareDataIndex)));
                 analysisCell.setOnlyOneVariable(Boolean.FALSE);
             }
-            String uniqueDataFlag = uniqueDataFlag(sheetNo, analysisCell.getPrefix());
+            String uniqueDataFlag = uniqueDataFlag(writeContext.writeSheetHolder(), analysisCell.getPrefix());
             if (WriteTemplateAnalysisCellTypeEnum.COMMON.equals(analysisCell.getCellType())) {
                 List<AnalysisCell> analysisCellList = templateAnalysisCache.get(uniqueDataFlag);
                 if (analysisCellList == null) {
@@ -503,11 +502,17 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor {
         return prepareData;
     }
 
-    private String uniqueDataFlag(Integer sheetNo, String wrapperName) {
+    private String uniqueDataFlag(WriteSheetHolder writeSheetHolder, String wrapperName) {
+        String prefix;
+        if (writeSheetHolder.getSheetNo() != null) {
+            prefix = writeSheetHolder.getSheetNo().toString();
+        } else {
+            prefix = writeSheetHolder.getSheetName().toString();
+        }
         if (StringUtils.isEmpty(wrapperName)) {
-            return sheetNo.toString() + "-";
+            return prefix + "-";
         }
-        return sheetNo + "-" + wrapperName;
+        return prefix + "-" + wrapperName;
     }
 
 }