From 14931a9ea679733132767c8ec01f3688fb1f5598 Mon Sep 17 00:00:00 2001
From: "Mr.Li" <lhb2002@qq.com>
Date: Fri, 21 Apr 2023 18:23:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8D=95=E8=A1=A8=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E6=95=B0=E6=8D=AE=E4=B8=BA100w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/cmd/merge.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/cmd/cmd/merge.go b/cmd/cmd/merge.go
index 835dace..53bee32 100644
--- a/cmd/cmd/merge.go
+++ b/cmd/cmd/merge.go
@@ -6,6 +6,7 @@ import (
 	"github.com/xuri/excelize/v2"
 	"io"
 	"log"
+	"math"
 	"os"
 	"regexp"
 	"strconv"
@@ -131,7 +132,7 @@ func (m *Merge) reset() (err error) {
 func (m *Merge) count() {
 	m.total++
 	m.rowIndex++
-	if m.rowIndex > m.writer.Limit {
+	if m.rowIndex > m.writer.GetLimit() {
 		m.reset()
 	}
 }
@@ -173,6 +174,11 @@ func (w *Writer) GetFileName(fileIndex int) string {
 	return string(name)
 }
 
+func (w *Writer) GetLimit() int {
+	//excel 单表最大100w行数据
+	return int(math.Min(float64(w.Limit), 1000000))
+}
+
 func transform(record []string) []interface{} {
 	result := make([]interface{}, len(record))
 	for i2, s := range record {