|
@@ -968,12 +968,17 @@ func GetSandboxClassifyByIsShowMe(classifyList []*sandbox.SandboxClassifyItems,
|
|
|
for _, v := range sanboxList {
|
|
|
existClassify[v.SandboxClassifyId] = struct{}{}
|
|
|
}
|
|
|
+ for _, v := range classifyList {
|
|
|
+ if v.SandboxId > 0 {
|
|
|
+ list = append(list, v)
|
|
|
+ }
|
|
|
+ }
|
|
|
classifyAll, err := sandbox.GetSandboxClassifyAllIncludeParent()
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
classifyTree := sandbodClassifyTree(classifyAll, classifyId)
|
|
|
- list = GetClassifyListRemoveNoSandbox(classifyTree, existClassify)
|
|
|
+ list = append(list, GetClassifyListRemoveNoSandbox(classifyTree, existClassify)...)
|
|
|
return
|
|
|
}
|
|
|
|