From 06c0b03df2955475fe39ff2a793a5f151f4da99f Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期四, 17 八月 2023 19:25:30 +0800
Subject: [PATCH] Merge branch 'master' into fly
---
api/v1/masterOrder.go | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/api/v1/masterOrder.go b/api/v1/masterOrder.go
index 6415320..eedae04 100644
--- a/api/v1/masterOrder.go
+++ b/api/v1/masterOrder.go
@@ -98,7 +98,6 @@
ctx.Ok()
}
-
// checkMasterOrderParams
// 妫�鏌ヤ富璁㈠崟鍙傛暟
func checkMasterOrderParams(masterOrder request.MasterOrder) (errCode int, masterOrderModel model.MasterOrder) {
@@ -145,14 +144,14 @@
return
}
- masterOrders, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.Keyword)
+ masterOrders, total, errCode := masterOrderService.GetMasterOrderList(params.Page, params.PageSize, params.SearchMap)
if errCode != ecode.OK {
ctx.Fail(errCode)
return
}
ctx.OkWithDetailed(response.MasterOrderResponse{
- List: masterOrders,
- Count: len(masterOrders),
+ List: masterOrders,
+ Count: int(total),
})
}
--
Gitblit v1.8.0