From ec58bf196fb360bfcec35ed784ae9da90ffa3d42 Mon Sep 17 00:00:00 2001
From: jiangshuai <291802688@qq.com>
Date: 星期二, 12 十二月 2023 11:06:50 +0800
Subject: [PATCH] 调整listbycondition接口服务
---
controllers/location.go | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index e1102fa..80adda5 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,11 @@
if location.ParentId == 0 {
tree = append(tree, location)
} else {
+ if _, ok := m[location.ParentId]; !ok {
+ tree = append(tree, location)
+ continue
+ }
+ m[location.ParentId].Children = make([]*models.Location, 0)
m[location.ParentId].Children = append(m[location.ParentId].Children, location)
}
}
--
Gitblit v1.8.0