From ab0a7cbbbc786f198ab71aed4515ed8422a78cdf Mon Sep 17 00:00:00 2001
From: kercylan98 <kercylan@gmail.com>
Date: Mon, 17 Jul 2023 20:13:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=94=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E8=A2=AB=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 planner/pce/cs/xlsx.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/planner/pce/cs/xlsx.go b/planner/pce/cs/xlsx.go
index b81c6a5..b407d41 100644
--- a/planner/pce/cs/xlsx.go
+++ b/planner/pce/cs/xlsx.go
@@ -104,12 +104,16 @@ func (slf *Xlsx) GetData() [][]pce.DataInfo {
 				}
 			}
 
-			for i, field := range slf.GetFields() {
-				var isIndex = i-1 < slf.GetIndexCount()
+			for i, field := range fields {
+				var isIndex = i < slf.GetIndexCount()
 
 				var value string
 				if valueCell := slf.get(field.Index, y); valueCell != nil {
 					value = valueCell.String()
+					if isIndex && len(strings.TrimSpace(value)) == 0 {
+						stop = true
+						break
+					}
 				} else if isIndex {
 					stop = true
 					break
@@ -118,12 +122,10 @@ func (slf *Xlsx) GetData() [][]pce.DataInfo {
 				if valueCell == nil {
 					break
 				}
-				if len(fields) > i-1 {
-					line = append(line, pce.DataInfo{
-						DataField: field,
-						Value:     value,
-					})
-				}
+				line = append(line, pce.DataInfo{
+					DataField: field,
+					Value:     value,
+				})
 			}
 			if len(line) > 0 {
 				data = append(data, line)