fix bug

controllers/base_from_calculate.go

@@ -1529,6 +1529,11 @@ func (this *CalculateController) SaveAdjust() {
 	condition += " AND edb_name=? "
 	pars = append(pars, req.EdbName)
 
+	if req.EdbInfoId > 0 {
+		condition += " AND edb_info_id != ? "
+		pars = append(pars, req.EdbInfoId)
+	}
+
 	count, err := models.GetEdbInfoCountByCondition(condition, pars)
 	if err != nil {
 		br.Msg = "判断指标名称是否存在失败"
@@ -1547,16 +1552,9 @@ func (this *CalculateController) SaveAdjust() {
 	timestamp := strconv.FormatInt(time.Now().UnixNano(), 10)
 	uniqueCode := utils.MD5(utils.DATA_PREFIX + "_" + timestamp)
 
-	// 获取来源指标
-	fromEdbInfo, err := models.GetEdbInfoById(req.FromEdbInfoId)
-	if err != nil {
-		br.Msg = "获取指标信息失败"
-		br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
-		return
-	}
-	edbInfo, err := models.SaveAdjustEdb(req, fromEdbInfo, edbCode, uniqueCode)
+	edbInfo, err, errMsg := models.SaveAdjustEdb(req, edbCode, uniqueCode)
 	if err != nil {
-		br.Msg = "添加指标失败"
+		br.Msg = errMsg
 		br.Msg = "添加指标失败,Err:" + err.Error()
 		return
 	}
@@ -1583,7 +1581,7 @@ func (this *CalculateController) SaveAdjust() {
 	}
 
 	// 更新指标最大最小值
-	err, errMsg := models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
+	err, errMsg = models.UnifiedModifyEdbInfoMaxAndMinInfo(edbInfo)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()

models/base_from_adjust.go

@@ -29,7 +29,8 @@ type AddAdjustEdbData struct {
 }
 
 // SaveAdjustEdb 保存数据调整指标
-func SaveAdjustEdb(req SaveAdjustEdbReq, fromEdbInfo *EdbInfo, edbCode, uniqueCode string) (edbInfo *EdbInfo, err error) {
+func SaveAdjustEdb(req SaveAdjustEdbReq, edbCode, uniqueCode string) (edbInfo *EdbInfo, err error, errMsg string) {
+	errMsg = `添加指标失败`
 	o := orm.NewOrm()
 	to, err := o.Begin()
 	if err != nil {
@@ -69,6 +70,13 @@ func SaveAdjustEdb(req SaveAdjustEdbReq, fromEdbInfo *EdbInfo, edbCode, uniqueCo
 		}
 		edbInfo.EdbInfoId = int(newEdbInfoId)
 
+		// 获取来源指标
+		fromEdbInfo, tmpErr := GetEdbInfoById(req.FromEdbInfoId)
+		if tmpErr != nil {
+			err = tmpErr
+			errMsg = "获取来源指标信息失败"
+			return
+		}
 		//关联关系
 		{
 			calculateMappingItem := new(EdbInfoCalculateMapping)