Merge branch 'feature/eta1.5.7_edb_replace' into debug

controllers/data_manage/edb_info.go

@@ -3909,22 +3909,22 @@ func (this *ChartInfoController) EdbInfoReplace() {
 	}
 
 	// 替换相关性图表配置
-	go func() {
-		_, _ = data_manage.ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo)
-		/*if err != nil {
-			br.Msg = "替换失败"
-			br.ErrMsg = "替换失败 replace err:" + err.Error()
-			return
-		}*/
-	}()
+	//go func() {
+	_, _ = data_manage.ReplaceMultipleGraphConfigChartEdb(oldEdbInfo, newEdbInfo)
+	/*if err != nil {
+		br.Msg = "替换失败"
+		br.ErrMsg = "替换失败 replace err:" + err.Error()
+		return
+	}*/
+	//}()
 
-	go func() {
-		excel2.ReplaceEdbInExcel(oldEdbInfo, newEdbInfo)
-	}()
+	//go func() {
+	excel2.ReplaceEdbInExcel(oldEdbInfo, newEdbInfo)
+	//}()
 
-	go func() {
-		sandbox.ReplaceEdbInSandbox(oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId)
-	}()
+	//go func() {
+	sandbox.ReplaceEdbInSandbox(oldEdbInfo.EdbInfoId, newEdbInfo.EdbInfoId)
+	//}()
 	br.Msg = "替换成功"
 	br.ErrMsg = "替换成功"
 	br.Ret = 200

services/data/edb_classify.go

@@ -623,7 +623,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 			}
 			if len(tagXList) > 0 {
 				deleteStatus = 7
-				errMsg = "当前指标已添加到跨品种分析，不可删除"
+				tipsMsg = "当前指标已添加到跨品种分析，不可删除"
 				return
 			}
 			tagYList, tmpErr := cross_variety.GetChartInfoCrossVarietyByYEdbInfoId(edbInfoId)
@@ -635,7 +635,7 @@ func DeleteCheck(classifyId, edbInfoId int, sysUser *system.Admin) (deleteStatus
 
 			if len(tagYList) > 0 {
 				deleteStatus = 7
-				errMsg = "当前指标已添加到跨品种分析，不可删除"
+				tipsMsg = "当前指标已添加到跨品种分析，不可删除"
 				return
 			}
 			/*calculateCount, tmpErr := cross_variety.GetCountByEdbInfoId(edbInfoId)