From b4400a06b5f801bc7a85320680d0b6c45c547ff0 Mon Sep 17 00:00:00 2001 From: wangpengfei <274878379@qq.com> Date: 星期五, 28 七月 2023 10:21:33 +0800 Subject: [PATCH] fix --- service/masterOrder.go | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/service/masterOrder.go b/service/masterOrder.go index c1255a1..6ce2a5f 100644 --- a/service/masterOrder.go +++ b/service/masterOrder.go @@ -29,15 +29,6 @@ return ecode.OK } -func (MasterOrderService) GetMasterOrderList() ([]*model.MasterOrder, int) { - list, err := model.NewMasterOrderSearch().FindAll() - if err != nil { - return nil, ecode.MasterOrderListErr - } - - return list, ecode.OK -} - func (MasterOrderService) UpdateMasterOrder(masterOrder *model.MasterOrder) int { // check masterOrder exist _, err := model.NewMasterOrderSearch().SetId(masterOrder.Id).Find() @@ -52,3 +43,12 @@ return ecode.OK } + +func (MasterOrderService) GetMasterOrderList(page, pageSize int, keyword string) ([]*model.MasterOrder, int64, int) { + // get contact list + contacts, total, err := model.NewMasterOrderSearch().SetKeyword(keyword).SetPage(page, pageSize).FindAll() + if err != nil { + return nil, 0, ecode.MasterOrderListErr + } + return contacts, total, ecode.OK +} -- Gitblit v1.8.0