Merge branch 'feature/pool255_future_good' into debug

controllers/data_manage/future_good/future_good_chart_info.go

@@ -1404,20 +1404,21 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 		}
 		if v.Source == 0 {
 			name := strings.Split(v.EdbName, "(")
+			if barConfig.FutureGoodEdbName != "" {
+				name[0] = barConfig.FutureGoodEdbName
+			}
 			if len(name) > 1 {
-				if barConfig.FutureGoodEdbName != "" {
-					name[0] = barConfig.FutureGoodEdbName
-				}
 				v.EdbName = name[0] + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
+
 			if v.EdbNameEn != "" {
 				name = strings.Split(v.EdbNameEn, "(")
+				if barConfig.FutureGoodEdbNameEn != "" {
+					name[0] = barConfig.FutureGoodEdbNameEn
+				}
 				if len(name) > 1 {
-					if barConfig.FutureGoodEdbNameEn != "" {
-						name[0] = barConfig.FutureGoodEdbNameEn
-					}
 					v.EdbNameEn = name[0] + "(" + name[1]
 				}
 			}
@@ -1755,20 +1756,21 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		}
 		if v.Source == 0 {
 			name := strings.Split(v.EdbName, "(")
+			if barConfig.FutureGoodEdbName != "" {
+				name[0] = barConfig.FutureGoodEdbName
+			}
 			if len(name) > 1 {
-				if barConfig.FutureGoodEdbName != "" {
-					name[0] = barConfig.FutureGoodEdbName
-				}
 				v.EdbName = name[0] + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
+
 			if v.EdbNameEn != "" {
 				name = strings.Split(v.EdbNameEn, "(")
+				if barConfig.FutureGoodEdbNameEn != "" {
+					name[0] = barConfig.FutureGoodEdbNameEn
+				}
 				if len(name) > 1 {
-					if barConfig.FutureGoodEdbNameEn != "" {
-						name[0] = barConfig.FutureGoodEdbNameEn
-					}
 					v.EdbNameEn = name[0] + "(" + name[1]
 				}
 			}