From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期五, 28 七月 2023 10:21:33 +0800
Subject: [PATCH] fix
---
model/serviceContract.go | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/model/serviceContract.go b/model/serviceContract.go
index ad1dc9f..fd9dbb0 100644
--- a/model/serviceContract.go
+++ b/model/serviceContract.go
@@ -86,15 +86,23 @@
return record, err
}
-func (slf *ServiceContractSearch) FindAll() ([]*ServiceContract, error) {
+func (slf *ServiceContractSearch) FindAll() ([]*ServiceContract, int64, error) {
var db = slf.build()
var records = make([]*ServiceContract, 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("Products").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *ServiceContractSearch) SetId(id int) *ServiceContractSearch {
@@ -115,4 +123,4 @@
func (slf *ServiceContractSearch) SetOrder(order string) *ServiceContractSearch {
slf.OrderBy = order
return slf
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0