From c59053ef98942526930480345636ad3bb7b55596 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 27 七月 2023 14:28:40 +0800
Subject: [PATCH] fix
---
service/serviceContract.go | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/service/serviceContract.go b/service/serviceContract.go
index ed0fd26..a24b5ad 100644
--- a/service/serviceContract.go
+++ b/service/serviceContract.go
@@ -44,20 +44,20 @@
return ecode.OK
}
-func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
- list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
- if err != nil {
- return nil, ecode.SContractListErr
- }
+//func (SContractService) GetServiceContractByContractId(contractId int) ([]*model.ServiceContract, int) {
+// list, err := model.NewServiceContractSearch().SetId(contractId).FindAll()
+// if err != nil {
+// return nil, ecode.SContractListErr
+// }
+//
+// return list, ecode.OK
+//}
- return list, ecode.OK
-}
-
-func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int) {
+func (SContractService) GetServiceContractList(page, pageSize int, keyword string) ([]*model.ServiceContract, int64, int) {
// get contact list
- contacts, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewServiceContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
if err != nil {
- return nil, ecode.SContractListErr
+ return nil, 0, ecode.SContractListErr
}
- return contacts, ecode.OK
+ return contacts, total, ecode.OK
}
--
Gitblit v1.8.0