From 396941180030802dc046f3250492b44bb8a7ea81 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 13:39:33 +0800
Subject: [PATCH] fix
---
service/contract.go | 4 ++--
api/v1/contract.go | 7 +++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/api/v1/contract.go b/api/v1/contract.go
index ebd4cf2..4b94771 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -98,7 +98,6 @@
ctx.Ok()
}
-
func checkContractParams(contract request.Contract) (errCode int, contractModel model.Contract) {
//if contract.Number == "" {
// return ecode.InvalidParams, contractModel
@@ -135,14 +134,14 @@
return
}
- contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.Keyword)
+ contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.ContractResponse{
- List: contracts,
+ List: contracts,
Count: int(total),
})
-}
\ No newline at end of file
+}
diff --git a/service/contract.go b/service/contract.go
index 42e4c81..b966dce 100644
--- a/service/contract.go
+++ b/service/contract.go
@@ -44,9 +44,9 @@
return ecode.OK
}
-func (ContractService) GetContractList(page, pageSize int, keyword string) ([]*model.Contract, int64, int) {
+func (ContractService) GetContractList(page, pageSize int, data map[string]interface{}) ([]*model.Contract, int64, int) {
// get contact list
- contacts, total, err := model.NewContractSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+ contacts, total, err := model.NewContractSearch().SetPage(page, pageSize).SetSearchMap(data).FindAll()
if err != nil {
return nil, 0, ecode.ContractListErr
}
--
Gitblit v1.8.0