From bffb08d97cb49f2b231512570d87d0ecc4471724 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Tue, 9 Jun 2020 20:06:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BF=BD=E7=95=A5=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E4=BB=A3=E7=A0=81=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../alibaba/excel/analysis/v03/XlsSaxAnalyser.java  |  2 +-
 .../analysis/v03/handlers/BofRecordHandler.java     |  6 +++---
 .../metadata/holder/xls/XlsReadSheetHolder.java     | 12 ------------
 .../metadata/holder/xls/XlsReadWorkbookHolder.java  | 13 +++++++++++++
 4 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java b/src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
index bda4f53..e1c19be 100644
--- a/src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
+++ b/src/main/java/com/alibaba/excel/analysis/v03/XlsSaxAnalyser.java
@@ -147,7 +147,7 @@ public class XlsSaxAnalyser implements HSSFListener, ExcelReadExecutor {
             return;
         }
         boolean ignoreRecord = (handler instanceof IgnorableXlsRecordHandler)
-            && xlsReadContext.xlsReadSheetHolder() != null && xlsReadContext.xlsReadSheetHolder().getIgnoreRecord();
+            && xlsReadContext.xlsReadSheetHolder() != null && xlsReadContext.xlsReadWorkbookHolder().getIgnoreRecord();
         if (ignoreRecord) {
             // No need to read the current sheet
             return;
diff --git a/src/main/java/com/alibaba/excel/analysis/v03/handlers/BofRecordHandler.java b/src/main/java/com/alibaba/excel/analysis/v03/handlers/BofRecordHandler.java
index ee55981..3e6713c 100644
--- a/src/main/java/com/alibaba/excel/analysis/v03/handlers/BofRecordHandler.java
+++ b/src/main/java/com/alibaba/excel/analysis/v03/handlers/BofRecordHandler.java
@@ -26,6 +26,7 @@ public class BofRecordHandler extends AbstractXlsRecordHandler {
         XlsReadWorkbookHolder xlsReadWorkbookHolder = xlsReadContext.xlsReadWorkbookHolder();
         if (br.getType() == BOFRecord.TYPE_WORKBOOK) {
             xlsReadWorkbookHolder.setReadSheetIndex(null);
+            xlsReadWorkbookHolder.setIgnoreRecord(Boolean.FALSE);
             return;
         }
         if (br.getType() != BOFRecord.TYPE_WORKSHEET) {
@@ -44,10 +45,9 @@ public class BofRecordHandler extends AbstractXlsRecordHandler {
         ReadSheet readSheet = SheetUtils.match(actualReadSheet, xlsReadContext);
         if (readSheet != null) {
             xlsReadContext.currentSheet(readSheet);
-            xlsReadContext.xlsReadSheetHolder().setIgnoreRecord(Boolean.FALSE);
+            xlsReadContext.xlsReadWorkbookHolder().setIgnoreRecord(Boolean.FALSE);
         } else {
-            xlsReadContext.currentSheet(actualReadSheet);
-            xlsReadContext.xlsReadSheetHolder().setIgnoreRecord(Boolean.TRUE);
+            xlsReadContext.xlsReadWorkbookHolder().setIgnoreRecord(Boolean.TRUE);
         }
         // Go read the next one
         xlsReadWorkbookHolder.setReadSheetIndex(xlsReadWorkbookHolder.getReadSheetIndex() + 1);
diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadSheetHolder.java
index d0171ff..1d12ab6 100644
--- a/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadSheetHolder.java
+++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadSheetHolder.java
@@ -18,10 +18,6 @@ public class XlsReadSheetHolder extends ReadSheetHolder {
      * Row type.Temporary storage, last set in <code>ReadRowHolder</code>.
      */
     private RowTypeEnum tempRowType;
-    /**
-     * Ignore record.
-     */
-    private Boolean ignoreRecord;
     /**
      * Temp object index.
      */
@@ -33,7 +29,6 @@ public class XlsReadSheetHolder extends ReadSheetHolder {
 
     public XlsReadSheetHolder(ReadSheet readSheet, ReadWorkbookHolder readWorkbookHolder) {
         super(readSheet, readWorkbookHolder);
-        ignoreRecord = Boolean.FALSE;
         tempRowType = RowTypeEnum.EMPTY;
         objectCacheMap = new HashMap<Integer, String>(16);
     }
@@ -46,13 +41,6 @@ public class XlsReadSheetHolder extends ReadSheetHolder {
         this.tempRowType = tempRowType;
     }
 
-    public Boolean getIgnoreRecord() {
-        return ignoreRecord;
-    }
-
-    public void setIgnoreRecord(Boolean ignoreRecord) {
-        this.ignoreRecord = ignoreRecord;
-    }
 
     public Integer getTempObjectIndex() {
         return tempObjectIndex;
diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadWorkbookHolder.java
index 70c1c03..a8c86a7 100644
--- a/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadWorkbookHolder.java
+++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xls/XlsReadWorkbookHolder.java
@@ -42,6 +42,10 @@ public class XlsReadWorkbookHolder extends ReadWorkbookHolder {
      * Sheet Index
      */
     private Integer readSheetIndex;
+    /**
+     * Ignore record.
+     */
+    private Boolean ignoreRecord;
 
     public XlsReadWorkbookHolder(ReadWorkbook readWorkbook) {
         super(readWorkbook);
@@ -51,6 +55,7 @@ public class XlsReadWorkbookHolder extends ReadWorkbookHolder {
         if (getGlobalConfiguration().getUse1904windowing() == null) {
             getGlobalConfiguration().setUse1904windowing(Boolean.FALSE);
         }
+        ignoreRecord = Boolean.FALSE;
     }
 
     public POIFSFileSystem getPoifsFileSystem() {
@@ -100,4 +105,12 @@ public class XlsReadWorkbookHolder extends ReadWorkbookHolder {
     public void setReadSheetIndex(Integer readSheetIndex) {
         this.readSheetIndex = readSheetIndex;
     }
+
+    public Boolean getIgnoreRecord() {
+        return ignoreRecord;
+    }
+
+    public void setIgnoreRecord(Boolean ignoreRecord) {
+        this.ignoreRecord = ignoreRecord;
+    }
 }
-- 
GitLab