From af995cb29d795b453266a880501a8e94e24c591f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期三, 26 七月 2023 10:22:01 +0800
Subject: [PATCH] fix add pageInfo, keyword to serverContract return list
---
service/client.go | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/service/client.go b/service/client.go
index 8ec562a..2c9a1cd 100644
--- a/service/client.go
+++ b/service/client.go
@@ -8,7 +8,7 @@
type ClientService struct{}
func (ClientService) AddClient(client *model.Client) int {
- err := model.NewClientSearch().Create(client)
+ err := model.NewClientSearch(nil).Create(client)
if err != nil {
return ecode.ClientExist
}
@@ -17,32 +17,22 @@
func (ClientService) DeleteClient(id int) int {
// check client exist
- _, err := model.NewClientSearch().SetId(id).First()
+ _, err := model.NewClientSearch(nil).SetId(id).First()
if err != nil {
return ecode.ClientNotExist
}
// delete client
- err = model.NewClientSearch().SetId(id).Delete()
+ err = model.NewClientSearch(nil).SetId(id).Delete()
if err != nil {
return ecode.ClientDeleteErr
}
return ecode.OK
}
-func (ClientService) GetClientList() (int, []*model.Client) {
- // get client list
- clients, err := model.NewClientSearch().Find()
- if err != nil {
- return ecode.ClientListErr, nil
- }
-
- return ecode.OK, clients
-}
-
// CheckClientExist check client exist
func CheckClientExist(id int) int {
- _, err := model.NewClientSearch().SetId(id).First()
+ _, err := model.NewClientSearch(nil).SetId(id).First()
if err != nil {
return ecode.ClientNotExist
}
@@ -58,10 +48,19 @@
}
// update client
- err := model.NewClientSearch().SetId(client.Id).Update(client)
+ err := model.NewClientSearch(nil).SetId(client.Id).Update(client)
if err != nil {
return ecode.ClientUpdateErr
}
return ecode.OK
}
+
+func (ClientService) GetClientList(page, pageSize int, keyword string) ([]*model.Client, int) {
+ // get contact list
+ contacts, err := model.NewClientSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).Find()
+ if err != nil {
+ return nil, ecode.ClientListErr
+ }
+ return contacts, ecode.OK
+}
--
Gitblit v1.8.0