|
@@ -129,16 +129,19 @@ func getChartClassifyListForMe(adminInfo system.Admin, resp *data_manage.ChartCl
|
|
|
for _, v := range allChartInfo {
|
|
|
chartInfoMap[v.ChartClassifyId] = append(chartInfoMap[v.ChartClassifyId], v)
|
|
|
}
|
|
|
- for k, v := range rootList {
|
|
|
+ res := make([]*data_manage.ChartClassifyItems, 0)
|
|
|
+ for _, v := range rootList {
|
|
|
if existItems, ok := chartInfoMap[v.ChartClassifyId]; ok {
|
|
|
v.Children = existItems
|
|
|
} else {
|
|
|
- items := make([]*data_manage.ChartClassifyItems, 0)
|
|
|
- v.Children = items
|
|
|
+ // items := make([]*data_manage.ChartClassifyItems, 0)
|
|
|
+ // v.Children = items
|
|
|
+ continue
|
|
|
}
|
|
|
- rootList[k] = v
|
|
|
+ res = append(res, v)
|
|
|
+ // rootList[k] = v
|
|
|
}
|
|
|
- resp.AllNodes = rootList
|
|
|
+ resp.AllNodes = res
|
|
|
|
|
|
return
|
|
|
}
|