소스 검색

Merge branch 'hotfix/custom_chart_season_bug' into debug

xyxie 10 달 전
부모
커밋
fe2bb78131
1개의 변경된 파일6개의 추가작업 그리고 0개의 파일을 삭제
  1. 6 0
      services/data/chart_info.go

+ 6 - 0
services/data/chart_info.go

@@ -744,6 +744,9 @@ func GetSeasonEdbInfoDataListByXDate(dataList []*data_manage.EdbDataList, latest
 		}
 	}
 	lenYear := len(dataMap)
+	if chartLegendMaxYear > endYear {
+		chartLegendMaxYear = endYear
+	}
 	for k, v := range dataMap {
 		if i, ok := chartLegendMap[k]; ok {
 			//v.ChartLegend = strconv.Itoa(endYear - lenYear + i)
@@ -941,6 +944,9 @@ func GetSeasonEdbInfoDataListByXDateNong(result *data_manage.EdbDataResult, late
 		}
 	}
 	lenYear := len(dataMap)
+	if chartLegendMaxYear > endYear {
+		chartLegendMaxYear = endYear
+	}
 	for k, v := range dataMap {
 		if i, ok := chartLegendMap[k]; ok {
 			//v.ChartLegend = strconv.Itoa(endYear - lenYear + i)