From 7c0a8a4571a3d9e5830fba6a1671c751c02ae664 Mon Sep 17 00:00:00 2001
From: hellozrh <455741807@qq.com>
Date: Wed, 18 Jan 2023 14:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=9A=E4=B8=AAsheet?=
 =?UTF-8?q?=E9=A1=B5=E6=97=B6=EF=BC=8CdoAfterAllAnalysed=E8=B0=83=E7=94=A8?=
 =?UTF-8?q?=E6=AC=A1=E6=95=B0=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/hutool/poi/excel/sax/Excel03SaxReader.java   | 9 +++------
 .../src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java | 7 ++-----
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
index 31bbf8aeb..84fc2a51f 100644
--- a/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
+++ b/hutool-poi/src/main/java/cn/hutool/poi/excel/sax/Excel03SaxReader.java
@@ -6,6 +6,7 @@ import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.log.StaticLog;
 import cn.hutool.poi.excel.sax.handler.RowHandler;
 import cn.hutool.poi.exceptions.POIException;
 import org.apache.poi.hssf.eventusermodel.EventWorkbookBuilder.SheetRecordCollectingListener;
@@ -349,11 +350,8 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
 	 * @param lastCell 行结束的标识Record
 	 */
 	private void processLastCell(LastCellOfRowDummyRecord lastCell) {
-//		if(CollUtil.isNotBlank(this.rowCellList)) {
-			//整行内容全为空时，表示该行是空白行，不执行每行结束的handle.
-			// 每行结束时， 调用handle() 方法
-			this.rowHandler.handle(curRid, lastCell.getRow(), this.rowCellList);
-//		}
+		// 每行结束时， 调用handle() 方法
+		this.rowHandler.handle(curRid, lastCell.getRow(), this.rowCellList);
 		// 清空行Cache
 		this.rowCellList = new ArrayList<>(this.rowCellList.size());
 	}
@@ -362,7 +360,6 @@ public class Excel03SaxReader implements HSSFListener, ExcelSaxReader<Excel03Sax
 	 * 处理sheet结束后的操作
 	 */
 	private void processLastCellSheet(){
-		System.out.println("processLastCellSheet：rid="+rid+", curId="+curRid+",sheetName="+sheetName);
 		this.rowHandler.doAfterAllAnalysed();
 	}
 
diff --git a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
index a90f25526..c274ae1ab 100644
--- a/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
+++ b/hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelUtilTest.java
@@ -73,21 +73,18 @@ public class ExcelUtilTest {
 	}
 
 	@Test
-	public void readBySaxTest() {
+	public void doAfterAllAnalysedTest() {
 		String path = "readBySax.xls";
-		AtomicInteger assertRowNum = new AtomicInteger(0);
 		try{
-			ExcelUtil.readBySax(path, 0, new RowHandler() {
+			ExcelUtil.readBySax(path, -1, new RowHandler() {
 				@Override
 				public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
 					System.out.println(StrUtil.format("sheetIndex={};rowIndex={},rowCells={}",sheetIndex,rowIndex,rowCells));
-					assertRowNum.addAndGet(1);
 				}
 			});
 		}catch (Exception ex){
 			ex.printStackTrace();
 		}
-		//Assert.assertEquals(3, assertRowNum.intValue());
 	}
 
 }