From a749e859e27e1046a4e018baadbe18a7c5e01b0d Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 09 八月 2023 14:30:23 +0800
Subject: [PATCH] fix
---
model/masterOrder.go | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/model/masterOrder.go b/model/masterOrder.go
index 2167555..71f053e 100644
--- a/model/masterOrder.go
+++ b/model/masterOrder.go
@@ -77,11 +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)
+ 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)
+ }
+
+ 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 {
@@ -102,4 +114,4 @@
func (slf *MasterOrderSearch) SetOrder(order string) *MasterOrderSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0