From dac214fa72dc2974954a4d8ee934695f548ad155 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 02 八月 2023 14:14:30 +0800
Subject: [PATCH] fix
---
model/salesReturn.go | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/model/salesReturn.go b/model/salesReturn.go
index d99df06..94e1232 100644
--- a/model/salesReturn.go
+++ b/model/salesReturn.go
@@ -22,12 +22,11 @@
SalesReturnSearch struct {
SalesReturn
- Orm *gorm.DB
+ Orm *gorm.DB
Keyword string
OrderBy string
PageNum int
PageSize int
-
}
)
@@ -75,11 +74,19 @@
return record, err
}
-func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, error) {
+func (slf *SalesReturnSearch) FindAll() ([]*SalesReturn, int64, error) {
var db = slf.build()
- var record = make([]*SalesReturn, 0)
- err := db.Preload("Products").Find(&record).Error
- return record, err
+ var records = make([]*SalesReturn, 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").Find(&records).Error
+ return records, total, err
}
func (slf *SalesReturnSearch) SetId(id int) *SalesReturnSearch {
@@ -100,4 +107,4 @@
func (slf *SalesReturnSearch) SetOrder(order string) *SalesReturnSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0