|
@@ -1738,15 +1738,24 @@ func (this *SandboxController) ListV2() {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ classifyList, err := sandbox.GetAllSandboxClassify()
|
|
|
+ if err != nil && !utils.IsErrNoRow(err) {
|
|
|
+ br.Msg = "获取分类信息失败"
|
|
|
+ br.ErrMsg = "获取分类信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ classsifyMap := make(map[int]*sandbox.SandboxClassifyItems)
|
|
|
+ for _, v := range classifyList {
|
|
|
+ classsifyMap[v.SandboxClassifyId] = v
|
|
|
+ }
|
|
|
+
|
|
|
for i, v := range list {
|
|
|
- ids, err := sandbox.GetSandboxAllParentByClassifyId(v.SandboxClassifyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取父级信息错误!"
|
|
|
- br.ErrMsg = "获取父级信息错误,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
+ parentIds := make([]int, 0)
|
|
|
+ sandboxService.GetSandBoxParentIds(v.SandboxClassifyId, classsifyMap, parentIds)
|
|
|
+ ids := utils.IntArr2joinString(parentIds,",")
|
|
|
list[i].ParentIds = ids
|
|
|
}
|
|
|
+
|
|
|
resp := new(sandbox.SandboxListResp)
|
|
|
if list == nil || len(list) <= 0 || (err != nil && utils.IsErrNoRow(err)) {
|
|
|
items := make([]*sandbox.SandboxListItems, 0)
|