解决冲突

controllers/data_manage/edb_info_refresh.go

@@ -716,7 +716,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			if ok {
 				continue
 			}
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop==1{
+			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
 				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return
@@ -733,7 +733,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			return
 		}
 		for _, v := range edbRelationList {
-			if v.RelationNum > 0 && v.IsSupplierStop == 0  && isStop==1{
+			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop == 1 {
 				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return
@@ -749,8 +749,14 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 		br.IsSendEmail = false
 		return
 	}
-
-	var edbList []*data_manage.EdbInfo
+	//查询指标信息
+	edbList, e := data_manage.GetEdbInfoByIdList(edbIdList)
+	if e != nil && !utils.IsErrNoRow(e) {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取数据失败，Err:" + err.Error()
+		return
+	}
+	//var edbList []*data_manage.EdbInfo
 	// 如果是钢联化工，那么需要过滤供应商暂停的指标
 	if req.Source == utils.DATA_SOURCE_MYSTEEL_CHEMICAL {
 		// 获取未被供应商暂停的指标
@@ -784,15 +790,6 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			br.Msg = "保存成功"
 			return
 		}
-	} else {
-		//查询指标信息
-		edbList, err = data_manage.GetEdbInfoByIdList(edbIdList)
-		if err != nil && !utils.IsErrNoRow(err) {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取数据失败，Err:" + err.Error()
-			return
-		}
-
 	}
 
 	fromEdbIdList := make([]int, 0)