|
|
@@ -896,7 +896,7 @@ func (this *EdbClassifyController) SimpleList() {
|
|
|
for _, v := range confList {
|
|
|
noPermissionEdbInfoIdMap[v.EdbInfoId] = true
|
|
|
}
|
|
|
- allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(parentId, 0)
|
|
|
+ allEdbInfo, err := data_manage.GetEdbInfoByClassifyId(parentId, 0, 0)
|
|
|
if err != nil {
|
|
|
br.Msg = "获取指标数据失败"
|
|
|
br.ErrMsg = "获取指标数据失败，Err:" + err.Error()
|
|
|
@@ -923,11 +923,13 @@ func (this *EdbClassifyController) SimpleList() {
|
|
|
v.Children = make([]*data_manage.EdbClassifyItems, 0)
|
|
|
nodeAll = append(nodeAll, v)
|
|
|
}
|
|
|
-
|
|
|
+ }
|
|
|
+ if len(nodeAll) > 0 {
|
|
|
//根据sort值排序
|
|
|
sortList = nodeAll
|
|
|
sort.Sort(sortList)
|
|
|
}
|
|
|
+
|
|
|
language := `CN`
|
|
|
// 指标显示的语言
|
|
|
{
|
