Merge remote-tracking branch 'origin/eta/2.3' into debug

controllers/data_manage/chart_info_share.go

@@ -522,12 +522,16 @@ func (c *ChartInfoShareController) ListByEs() {
 
 	// 因为是ES查找的，所以需要重新查一下图表的信息，主要是为了把是否授权字段找出来
 	if len(chartInfoList) > 0 {
+		chartTypeMap := make(map[int]*data_manage.ChartType)
+
 		sysUserIdList := make([]int, 0)
 		chartInfoIdList := make([]int, 0)
+		currChartTypeList := make([]int, 0)
 		for _, v := range chartInfoList {
 			v.ConvertToResp()
 			v.HaveOperaAuth = true
 			chartInfoIdList = append(chartInfoIdList, v.ChartInfoId)
+			currChartTypeList = append(currChartTypeList, v.ChartType)
 
 			if v.SharedUserIdList != nil && len(v.SharedUserIdList) > 0 {
 				sysUserIdList = append(sysUserIdList, v.SharedUserIdList...)
@@ -561,6 +565,19 @@ func (c *ChartInfoShareController) ListByEs() {
 			}
 		}
 
+		// 图表类型
+		{
+			tmpChartTypeList, err := data_manage.GetChartTypeListByIdList(currChartTypeList)
+			if err != nil {
+				br.Msg = "获取图表类型失败"
+				br.ErrMsg = "获取图表类型失败，Err:" + err.Error()
+				return
+			}
+			for _, v := range tmpChartTypeList {
+				chartTypeMap[v.ChartTypeId] = v
+			}
+		}
+
 		for _, v := range chartInfoList {
 			tmpChartInfo, ok := chartInfoMap[v.ChartInfoId]
 			if !ok {
@@ -568,6 +585,11 @@ func (c *ChartInfoShareController) ListByEs() {
 			}
 			v.IsJoinPermission = tmpChartInfo.IsJoinPermission
 
+			// 图表类型名称
+			if chartType, ok := chartTypeMap[v.ChartType]; ok {
+				v.ChartTypeName = chartType.ChartTypeName
+			}
+
 			// 分享人
 			shareUserName := ``
 			shareUserNameList := make([]string, 0)

models/data_manage/chart_type.go

@@ -49,7 +49,7 @@ func GetChartTypeListByIdList(idList []int) (items []*ChartType, err error) {
 	}
 	o := global.DmSQL["data"]
 	sql := `SELECT * FROM chart_type WHERE chart_type_id IN (?) `
-	err = o.Raw(sql).Scan(&items).Error
+	err = o.Raw(sql, idList).Find(&items).Error
 
 	return
 }