Merge branch 'feature/pool255_future_good' into debug

controllers/data_manage/future_good/future_good_chart_info.go

@@ -1406,10 +1406,14 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 			name := strings.Split(v.EdbName, "(")
 			if barConfig.FutureGoodEdbName != "" {
 				name[0] = barConfig.FutureGoodEdbName
+			} else {
+
 			}
-			v.EdbName = name[0]
 			if len(name) > 1 {
-				v.EdbName = v.EdbName + "(" + name[1]
+				if barConfig.FutureGoodEdbName == "" {
+					barConfig.FutureGoodEdbName = name[0]
+				}
+				v.EdbName = name[0] + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
@@ -1419,9 +1423,11 @@ func getFutureGoodChartInfo(chartInfo *data_manage.ChartInfoView, chartType, dat
 				if barConfig.FutureGoodEdbNameEn != "" {
 					name[0] = barConfig.FutureGoodEdbNameEn
 				}
-				v.EdbNameEn = name[0]
 				if len(name) > 1 {
-					v.EdbNameEn = v.EdbNameEn + "(" + name[1]
+					if barConfig.FutureGoodEdbNameEn == "" {
+						barConfig.FutureGoodEdbNameEn = name[0]
+					}
+					v.EdbNameEn = name[0] + "(" + name[1]
 				}
 			}
 		}
@@ -1760,10 +1766,14 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 			name := strings.Split(v.EdbName, "(")
 			if barConfig.FutureGoodEdbName != "" {
 				name[0] = barConfig.FutureGoodEdbName
+			} else {
+
 			}
-			v.EdbName = name[0]
 			if len(name) > 1 {
-				v.EdbName = v.EdbName + "(" + name[1]
+				if barConfig.FutureGoodEdbName == "" {
+					barConfig.FutureGoodEdbName = name[0]
+				}
+				v.EdbName = name[0] + "(" + name[1]
 			}
 			//英文
 			// 编译正则表达式，匹配一个或多个数字
@@ -1773,9 +1783,11 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 				if barConfig.FutureGoodEdbNameEn != "" {
 					name[0] = barConfig.FutureGoodEdbNameEn
 				}
-				v.EdbNameEn = name[0]
 				if len(name) > 1 {
-					v.EdbNameEn = v.EdbNameEn + "(" + name[1]
+					if barConfig.FutureGoodEdbNameEn == "" {
+						barConfig.FutureGoodEdbNameEn = name[0]
+					}
+					v.EdbNameEn = name[0] + "(" + name[1]
 				}
 			}
 		}