From 2db8d964a7b693a57e962e21b27b100bba37ed42 Mon Sep 17 00:00:00 2001
From: unknown <wangbin@taover.com>
Date: Tue, 11 Aug 2020 16:17:28 +0800
Subject: [PATCH]  fix a bug about xlsx active tab calc

---
 src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java |  9 ++++++---
 src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java                    |  6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java b/src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java
index 15d6038..342ab9d 100644
--- a/src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java
+++ b/src/main/java/com/taover/easyexcel/analysis/v07/workbook/WorkbookAnalyserImpl.java
@@ -1,7 +1,10 @@
 package com.taover.easyexcel.analysis.v07.workbook;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -12,6 +15,7 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
 import com.taover.easyexcel.analysis.v07.metadata.WorkbookSheet;
@@ -81,7 +85,7 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
 					++hiddenSheetNum;
 				}
 			}
-			this.activeTabIndex = hiddenSheetNum + activeTab - 1;
+			this.activeTabIndex = hiddenSheetNum + activeTab;
 		}
 	}
 
@@ -129,6 +133,5 @@ public class WorkbookAnalyserImpl implements WorkbookAnalyser {
 			return false;
 		}
 		return this.sheetList.get(sheetIndex).getState().equals(ATTR_STATE_V_HIDDEN);
-	}
-	
+	}	
 }
diff --git a/src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java b/src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
index 5edf08c..1e98542 100644
--- a/src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
+++ b/src/test/java/com/taover/easyexcel/test/demo/read/ReadTest.java
@@ -280,12 +280,12 @@ public class ReadTest {
     	for(String item: sonFileNameArr) {
     		try {
     			LOGGER.info("======文件名称："+item+"======");
-    			Map<Integer, List<Map<Integer, Object>>> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadAllSyncForMap();
+    			List<Object> listMap = EasyExcel.read(dirStr+item).headRowNumber(0).readHiddenRow(false).doReadSelectedSync();
 //                for (Map<Integer, String> data : listMap) {
 //                    // 返回每条数据的键值对 表示所在的列 和所在列的值
 //                    //LOGGER.info(">{}", JSON.toJSONString(data));
 //                }
-                LOGGER.info(">SUCCESS{}", JSON.toJSONString(listMap));
+                LOGGER.info(">{}", JSON.toJSONString(listMap));
     		}catch (Exception e) {
     			e.printStackTrace();
 			}
@@ -304,6 +304,6 @@ public class ReadTest {
     
     public static void main(String args[]) {
     	ReadTest rt = new ReadTest();
-    	rt.synchronousRead();
+    	rt.readTestSynchronousRead();
     }
 }
--
libgit2 0.21.2