From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
service/contract.go | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/service/contract.go b/service/contract.go
index a1e56e5..42e4c81 100644
--- a/service/contract.go
+++ b/service/contract.go
@@ -44,11 +44,11 @@
return ecode.OK
}
-func (ContractService) GetContractList(page, pageSize int, keyword string) ([]*model.Contract, int) {
+func (ContractService) GetContractList(page, pageSize int, keyword string) ([]*model.Contract, int64, int) {
// get contact list
- contacts, err := model.NewContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
if err != nil {
- return nil, ecode.ContractListErr
+ return nil, 0, ecode.ContractListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0