Merge branch 'feature/eta_2.5.6_pb_data_deal' into debug

controllers/data_manage/edb_info_refresh.go

@@ -690,6 +690,10 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 	// todo 批量设置刷新状态修改
 	edbIdList := make([]int, 0)
 	edbCodeList := make([]string, 0)
+	isStop := 0
+	if req.ModifyStatus == `暂停` {
+		isStop = 1
+	}
 	// 指标id列表
 	if req.IsSelectAll {
 		// 如果是列表全选
@@ -712,7 +716,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			if ok {
 				continue
 			}
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 {
+			if v.RelationNum > 0 && v.IsSupplierStop == 0 && isStop==1{
 				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return
@@ -729,7 +733,7 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 			return
 		}
 		for _, v := range edbRelationList {
-			if v.RelationNum > 0 && v.IsSupplierStop == 0 {
+			if v.RelationNum > 0 && v.IsSupplierStop == 0  && isStop==1{
 				br.Msg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				br.ErrMsg = "保存失败，停用指标已被引用,指标ID:" + v.EdbCode + "指标名称:" + v.EdbName
 				return
@@ -801,11 +805,6 @@ func (c *EdbInfoController) SaveRelationEdbRefreshStatus() {
 		}
 	}
 
-	isStop := 0
-	if req.ModifyStatus == `暂停` {
-		isStop = 1
-	}
-
 	// 查询计算指标ID
 	// 查询相关的计算指标
 	calculateEdbIdList := make([]int, 0)