From f9bdc0f7071b7e3a9c7a5157f62747fddfc56d4e Mon Sep 17 00:00:00 2001
From: ayflying <ay@7cuu.com>
Date: Thu, 16 Jan 2025 15:26:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E8=A1=A8=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9B=B4=E5=A4=9A=E5=A5=87=E6=80=AA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 excel/tools.go | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/excel/tools.go b/excel/tools.go
index a42f16b..4e4d257 100644
--- a/excel/tools.go
+++ b/excel/tools.go
@@ -27,20 +27,32 @@ func Excel2Slice(filePath string, _sheet ...string) [][]string {
 
 // 字符串转道具类型
 func (s *Excel) Spilt2Item(str string) (result [][]int64) {
-	var parts []string
-	parts1 := strings.Split(str, "|") // 分割字符串
-	if parts1 == nil {
-		parts1 = []string{str}
+	var shadiao = []string{","}
+	for _, v := range shadiao {
+		str = strings.ReplaceAll(str, v, "|")
+		//parts = append(parts, strings.Split(str, v)...) // 分割字符串
 	}
-	for _, v := range parts1 {
-		parts2 := strings.Split(v, ",") // 分割字符串
-		if parts2 == nil {
-			parts = append(parts, v)
-		} else {
-			parts = append(parts, parts2...)
-		}
+
+	//var parts []string
+	parts := strings.Split(str, "|") // 分割字符串
+	if parts == nil {
+		parts = []string{str}
 	}
 
+	//var parts []string
+	//for _, v := range parts1 {
+	//	parts = append(parts, strings.Split(v, ",")...) // 分割字符串
+	//}
+
+	//for _, v := range parts1 {
+	//	parts2 := strings.Split(v, ",") // 分割字符串
+	//	if parts2 == nil {
+	//		parts = append(parts, v)
+	//	} else {
+	//		parts = append(parts, parts2...)
+	//	}
+	//}
+
 	for i := 0; i < len(parts)-1; i += 2 {
 		num1, _ := strconv.ParseInt(parts[i], 10, 64)
 		num2, _ := strconv.ParseInt(parts[i+1], 10, 64)