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/subOrder.go | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/model/subOrder.go b/model/subOrder.go
index 46bcc9f..3914981 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -71,11 +71,19 @@
return
}
-func (slf *SubOrderSearch) FindAll() ([]*SubOrder, error) {
+func (slf *SubOrderSearch) FindAll() ([]*SubOrder, int64, error) {
var db = slf.build()
- var records []*SubOrder
+ var records = make([]*SubOrder, 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
+ }
+
err := db.Preload("Products").Preload("Client").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {
@@ -96,4 +104,4 @@
func (slf *SubOrderSearch) SetOrder(order string) *SubOrderSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0