单位信息

services/data/chart_extra_config.go

@@ -499,19 +499,31 @@ func GetChartSectionCombineData(chartInfoId int, mappingList []*data_manage.Char
 	} else {
 		right2Unit = firstUnit
 	}
-	if unitList.LeftName != "" {
+	if leftUnit != nil {
 		unitList.LeftName = leftUnit.Name
 		unitList.LeftNameEn = leftUnit.NameEn
 	}
-	if unitList.RightName != "" {
+	if rightUnit != nil {
 		unitList.RightName = rightUnit.Name
 		unitList.RightNameEn = rightUnit.NameEn
 	}
-
-	if unitList.RightTwoName != "" {
+	if right2Unit != nil {
 		unitList.RightTwoName = right2Unit.Name
 		unitList.RightTwoNameEn = right2Unit.NameEn
 	}
+	if extraConfig.UnitList.LeftName != "" {
+		unitList.LeftName = extraConfig.UnitList.LeftName
+		unitList.LeftNameEn = extraConfig.UnitList.LeftNameEn
+	}
+	if extraConfig.UnitList.RightName != "" {
+		unitList.RightName = extraConfig.UnitList.RightName
+		unitList.RightNameEn = extraConfig.UnitList.RightNameEn
+	}
+
+	if extraConfig.UnitList.RightTwoName != "" {
+		unitList.RightTwoName = extraConfig.UnitList.RightTwoName
+		unitList.RightTwoNameEn = extraConfig.UnitList.RightTwoNameEn
+	}
 
 	dataListResp.SeriesList = extraConfig.SeriesList
 	dataListResp.DateConfList = extraConfig.DateConfList