From a2cfbd59045d7426088e9ec9e93794dc895849a9 Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期三, 03 七月 2024 23:13:40 +0800 Subject: [PATCH] 获取位置列表增加仓库ID传参,默认位置去掉仓库code拼接, 修复若干bug --- controllers/location.go | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/controllers/location.go b/controllers/location.go index 5a4a3f9..90e6749 100644 --- a/controllers/location.go +++ b/controllers/location.go @@ -31,6 +31,12 @@ util.ResponseFormat(c, code.RequestParamError, err) return } + + if params.WarehouseId == 0 { + util.ResponseFormat(c, code.RequestParamError, "浠撳簱ID鍙傛暟缂哄け") + return + } + if params.ParentId != 0 { //鏌ヨ涓婄骇鍚嶇О first, err := models.NewLocationSearch().SetID(params.ParentId).First() @@ -82,7 +88,9 @@ search.SetPage(params.Page, params.PageSize) } list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName). - SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").Find() + SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc"). + SetWarehouseId(params.WarehouseId). + Find() if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触") return -- Gitblit v1.8.0