From c59053ef98942526930480345636ad3bb7b55596 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 27 七月 2023 14:28:40 +0800
Subject: [PATCH] fix

---
 model/masterOrder.go |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/model/masterOrder.go b/model/masterOrder.go
index c82e6ce..b50833f 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -77,15 +77,23 @@
 	return record, err
 }
 
-func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, error) {
+func (slf *MasterOrderSearch) FindAll() ([]*MasterOrder, int64, error) {
 	var db = slf.build()
 	var records = make([]*MasterOrder, 0)
 	if slf.PageNum > 0 && slf.PageSize > 0 {
 		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
 	}
+	var total int64
+	if err := db.Count(&total).Error; err != nil {
+		return records, total, err
+	}
+
+	if slf.PageNum > 0 && slf.PageSize > 0 {
+		db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+	}
 
 	err := db.Preload("Client").Find(&records).Error
-	return records, err
+	return records, total, err
 }
 
 func (slf *MasterOrderSearch) SetId(id int) *MasterOrderSearch {

--
Gitblit v1.8.0