From ff3e203423f296965472d1f09347cda5cfe3a786 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 11 八月 2023 11:37:19 +0800
Subject: [PATCH] update

---
 model/subOrder.go |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/model/subOrder.go b/model/subOrder.go
index 2163d75..42bb6eb 100644
--- a/model/subOrder.go
+++ b/model/subOrder.go
@@ -20,12 +20,11 @@
 	SubOrderSearch struct {
 		SubOrder
 
-				Orm      *gorm.DB
+		Orm      *gorm.DB
 		Keyword  string
 		OrderBy  string
 		PageNum  int
 		PageSize int
-
 	}
 )
 
@@ -72,10 +71,19 @@
 	return
 }
 
-func (slf *SubOrderSearch) FindAll() (result []*SubOrder, err error) {
+func (slf *SubOrderSearch) FindAll() ([]*SubOrder, int64, error) {
 	var db = slf.build()
-	err = db.Preload("Products").Preload("Client").Find(&result).Error
-	return
+	var records = make([]*SubOrder, 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)
+	}
+
+	err := db.Preload("Products").Preload("Client").Find(&records).Error
+	return records, total, err
 }
 
 func (slf *SubOrderSearch) SetId(id int) *SubOrderSearch {

--
Gitblit v1.8.0