Ver código fonte

fix:指标库录入的时候,修复不能添加钢联原始数据库的指标的bug

Roc 6 meses atrás
pai
commit
dad0fb7061
1 arquivos alterados com 10 adições e 4 exclusões
  1. 10 4
      controllers/data_manage/edb_info.go

+ 10 - 4
controllers/data_manage/edb_info.go

@@ -85,9 +85,10 @@ func (this *EdbInfoController) EdbInfoSearch() {
 	//判断指标是否存在
 	var item *data_manage.EdbInfo
 	var err error
-	if source == utils.DATA_SOURCE_GL {
+	if utils.InArrayByInt([]int{utils.DATA_SOURCE_GL, utils.DATA_SOURCE_MYSTEEL_CHEMICAL}, source) {
 		// 如果是钢联的话,那么就先判断是不是存在钢联化工
-		item, err = data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_MYSTEEL_CHEMICAL, edbCode)
+		source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
+		item, err = data_manage.GetEdbInfoByEdbCode(source, edbCode)
 		if err != nil {
 			if err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取失败"
@@ -99,8 +100,9 @@ func (this *EdbInfoController) EdbInfoSearch() {
 		if item != nil {
 			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
 		} else {
+			source = utils.DATA_SOURCE_GL
 			// 判断是不是已经在钢联这边已经存在了
-			item, err = data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_GL, edbCode)
+			item, err = data_manage.GetEdbInfoByEdbCode(source, edbCode)
 			if err != nil {
 				if err.Error() != utils.ErrNoRow() {
 					br.Msg = "获取失败"
@@ -112,6 +114,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 
 			// 如果在钢联来源也没找到,那么就需要再判断下是否处于 《钢联化工》 数据源里面
 			if item == nil {
+				source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
 				tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(edbCode)
 				if err != nil {
 					if err.Error() != utils.ErrNoRow() {
@@ -2386,7 +2389,7 @@ func (this *EdbInfoController) EdbInfoAdd() {
 	//}
 
 	// 兼容钢联与钢联化工数据
-	if source == utils.DATA_SOURCE_GL {
+	if utils.InArrayByInt([]int{utils.DATA_SOURCE_GL, utils.DATA_SOURCE_MYSTEEL_CHEMICAL}, source) {
 		// 如果是钢联的话,那么就先判断是不是存在钢联化工
 		tmpInfo, err := data_manage.GetBaseFromMysteelChemicalIndexByCode(req.EdbCode)
 		if err != nil {
@@ -2399,6 +2402,9 @@ func (this *EdbInfoController) EdbInfoAdd() {
 		if tmpInfo != nil {
 			source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
 			req.Source = utils.DATA_SOURCE_MYSTEEL_CHEMICAL
+		} else {
+			source = utils.DATA_SOURCE_GL
+			req.Source = utils.DATA_SOURCE_GL
 		}
 	}