From 18939d88db4799b2ba0359016d9a4ae1e76e2a22 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 29 三月 2024 14:01:35 +0800
Subject: [PATCH] 完善
---
controllers/location.go | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/controllers/location.go b/controllers/location.go
index 29ad83b..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
@@ -102,7 +103,10 @@
tree = append(tree, location)
continue
}
- m[location.ParentId].Children = make([]*models.Location, 0)
+ 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