|
@@ -2375,7 +2375,7 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
|
|
|
}
|
|
|
// 当前列表中的分类map
|
|
|
chartClassifyMap := make(map[int]*data_manage.ChartClassify)
|
|
|
-
|
|
|
+ isSelectClassifyMap := make(map[int]bool)
|
|
|
// 图表分类
|
|
|
{
|
|
|
chartClassifyList, err := data_manage.GetChartClassifyByIdList(classifyIdList)
|
|
@@ -2386,6 +2386,9 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
|
|
|
}
|
|
|
for _, v := range chartClassifyList {
|
|
|
chartClassifyMap[v.ChartClassifyId] = v
|
|
|
+ if v.IsSelected == 1 {
|
|
|
+ isSelectClassifyMap[v.ChartClassifyId] = true
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
// 图表
|
|
@@ -2435,6 +2438,9 @@ func (this *ChartInfoController) ChartInfoSearchByEs() {
|
|
|
if tmp.SearchText == "" {
|
|
|
tmp.SearchText = v.ChartName
|
|
|
}
|
|
|
+ if _, ok := isSelectClassifyMap[v.ChartClassifyId]; ok {
|
|
|
+ tmp.IsSelected = 1
|
|
|
+ }
|
|
|
finalList = append(finalList, tmp)
|
|
|
}
|
|
|
}
|