|
@@ -2,6 +2,7 @@ package controllers
|
|
|
|
|
|
import (
|
|
|
"eta/eta_mini_bridge/models"
|
|
|
+ "eta/eta_mini_bridge/services"
|
|
|
"eta/eta_mini_bridge/utils"
|
|
|
"fmt"
|
|
|
"sort"
|
|
@@ -360,7 +361,24 @@ func (this *ChartPermissionController) ClassifyTree() {
|
|
|
br.ErrMsg = "获取类别信息失败,系统错误,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- classifyList = getClassifyTree(classifyList, parentClassifyList)
|
|
|
+
|
|
|
+ var rootClassifyIds []int
|
|
|
+ for _, v := range parentClassifyList {
|
|
|
+ if v.ParentId != 0 {
|
|
|
+ rootClassifyIds = append(rootClassifyIds, v.ParentId)
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ rootClassifyIds = utils.Unique(rootClassifyIds)
|
|
|
+ rootClassifyList, err := models.GetClassifyListByIds(rootClassifyIds)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取分类失败"
|
|
|
+ br.ErrMsg = "获取类别信息失败,系统错误,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ classifyList = append(classifyList, parentClassifyList...)
|
|
|
+ classifyList = append(classifyList, rootClassifyList...)
|
|
|
+ classifyList = services.GetClassifyTree(classifyList, 0)
|
|
|
|
|
|
br.Msg = "分类列表获取成功"
|
|
|
br.Data = classifyList
|