Browse Source

fix:没有的话,就返回空数组

Roc 4 months ago
parent
commit
28a0c08b26
2 changed files with 11 additions and 1 deletions
  1. 10 0
      controllers/data_manage/chart_info.go
  2. 1 1
      models/data_manage/edb_info.go

+ 10 - 0
controllers/data_manage/chart_info.go

@@ -1687,6 +1687,11 @@ func (this *ChartInfoController) ChartInfoDetailV2() {
 			}
 		}
 
+		// 没有就返回空数组
+		if len(edbList) <= 0 {
+			edbList = make([]*data_manage.ChartEdbInfoMapping, 0)
+		}
+
 		resp.EdbInfoList = edbList
 		resp.XEdbIdValue = xEdbIdValue
 		resp.YDataList = yDataList
@@ -2738,6 +2743,11 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartClassifyParent)
 	}
 	chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartViewClassify)
+
+	// 没有就返回空数组
+	if len(edbList) <= 0 {
+		edbList = make([]*data_manage.ChartEdbInfoMapping, 0)
+	}
 	resp.EdbInfoList = edbList
 	//判断是否需要展示英文标识
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList, chartInfo.Source, chartInfo.ChartType)

+ 1 - 1
models/data_manage/edb_info.go

@@ -437,7 +437,7 @@ func (e *EdbData) AfterFind(db *gorm.DB) (err error) {
 // @Description: 转成需要输出的格式
 // @receiver m
 func (e *EdbData) ConvertToResp() {
-	e.DataTime = utils.GormDateStrToDateTimeStr(e.DataTime)
+	e.DataTime = utils.GormDateStrToDateStr(e.DataTime)
 
 	return
 }