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/contract.go | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/model/contract.go b/model/contract.go
index 70886c9..d0c0e78 100644
--- a/model/contract.go
+++ b/model/contract.go
@@ -74,15 +74,23 @@
return record, err
}
-func (slf *ContractSearch) FindAll() ([]*Contract, error) {
+func (slf *ContractSearch) FindAll() ([]*Contract, int64, error) {
var db = slf.build()
var records = make([]*Contract, 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
+ }
+
+ if slf.PageNum > 0 && slf.PageSize > 0 {
+ db = db.Limit(slf.PageSize).Offset((slf.PageNum - 1) * slf.PageSize)
+ }
err := db.Preload("Quotation").Find(&records).Error
- return records, err
+ return records, total, err
}
func (slf *ContractSearch) SetId(id int) *ContractSearch {
--
Gitblit v1.8.0