From c2be95e83d1597eed8623fdd70a77d617465f91e Mon Sep 17 00:00:00 2001 From: zhangqian <zhangqian@123.com> Date: 星期五, 29 三月 2024 17:04:31 +0800 Subject: [PATCH] 查操作明细增加查询字段 --- controllers/location.go | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/controllers/location.go b/controllers/location.go index e1102fa..327c689 100644 --- a/controllers/location.go +++ b/controllers/location.go @@ -68,7 +68,8 @@ if params.PageInfo.Check() { search.SetPage(params.Page, params.PageSize) } - list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName).SetOrder("created_at desc").Find() + list, total, err := search.SetKeyword(params.KeyWord).SetType(params.Type).SetJointName(params.JointName). + SetIsScrapLocation(params.IsScrapLocation).SetOrder("created_at desc").Find() if err != nil { util.ResponseFormat(c, code.RequestParamError, "鏌ユ壘澶辫触") return @@ -98,6 +99,14 @@ if location.ParentId == 0 { tree = append(tree, location) } else { + if _, ok := m[location.ParentId]; !ok { + tree = append(tree, location) + continue + } + if m[location.ParentId].Children == nil { + m[location.ParentId].Children = make([]*models.Location, 0) + } + m[location.ParentId].Children = append(m[location.ParentId].Children, location) } } -- Gitblit v1.8.0