From 2f07b51e60c82b220aecd391da9a93051f8e1749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=81=AB=E7=BA=BF=E5=85=94?= <silverhawk@foxmail.com>
Date: Thu, 16 Jun 2022 17:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=88=E5=8F=96=E5=87=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E8=A1=A8=E8=A2=AB=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E9=9C=80=E8=A6=81=E5=85=88=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=86=8D=E5=8F=96=E5=87=BA=E6=95=B0=E6=8D=AE=E6=89=8D?=
 =?UTF-8?q?=E5=90=88=E7=90=86=EF=BC=8C=E4=B8=8A=E5=8F=A4BUG=E4=BB=8A?=
 =?UTF-8?q?=E5=A4=A9=E7=BB=86=E7=9C=8B=E6=89=8D=E5=8F=91=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gorose.go    |  2 +-
 orm_query.go | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gorose.go b/gorose.go
index 23d3b85..125f2c4 100644
--- a/gorose.go
+++ b/gorose.go
@@ -16,7 +16,7 @@ const (
 	// VERSION_TEXT ...
 	VERSION_TEXT = "\ngolang orm of gorose's version : "
 	// VERSION_NO ...
-	VERSION_NO = "v2.2.0"
+	VERSION_NO = "v1.3.0"
 	// VERSION ...
 	VERSION = VERSION_TEXT + VERSION_NO + GOROSE_IMG
 )
diff --git a/orm_query.go b/orm_query.go
index 9d9e1db..f83babb 100644
--- a/orm_query.go
+++ b/orm_query.go
@@ -413,18 +413,19 @@ func (dba *Orm) Paginate(page ...int) (res Data, err error) {
 	}
 	var offset = dba.GetOffset()
 	var currentPage = int(math.Ceil(float64(offset+1) / float64(limit)))
-	//dba.ResetUnion()
-	// 获取结果
-	resData, err := dba.Get()
-	if err != nil {
-		return
-	}
+
 	// 统计总量
 	dba.offset = 0
 	count, err := dba.Count()
 	var lastPage = int(math.Ceil(float64(count) / float64(limit)))
 	var nextPage = currentPage + 1
 	var prevPage = currentPage - 1
+	//dba.ResetUnion()
+	// 获取结果
+	resData, err := dba.Get()
+	if err != nil {
+		return
+	}
 	res = Data{
 		"total":          count,
 		"per_page":       limit,