change gorm

services/data/mysteel_chemical.go

@@ -206,7 +206,7 @@ func MoveMysteelChemicalClassify(classifyId, parentClassifyId, prevClassifyId, n
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.BaseFromMysteelChemicalClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateBaseFromMysteelChemicalClassifySortByClassifyId(parentClassifyId, firstClassify.BaseFromMysteelChemicalClassifyId-1, 0, updateSortStr)
 		}
@@ -440,7 +440,7 @@ func AddMysteelChemicalIndex(classifyId int, indexCode, updateWeek, updateTimeSt
 		errMsg = `获取数据失败`
 		return
 	}
-	if baseFromMysteelChemicalIndex != nil {
+	if baseFromMysteelChemicalIndex != nil && baseFromMysteelChemicalIndex.BaseFromMysteelChemicalIndexId > 0 {
 		if lang == utils.EnLangVersion {
 			errMsg = `Metric ID:` + indexCode + ` already exists, please re-enter.`
 		} else {
@@ -675,7 +675,7 @@ func MoveMysteelChemical(indexId, classifyId, prevIndexId, nextIndexId int, sysU
 		}
 
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
-		if firstClassify != nil && firstClassify.Sort == 0 {
+		if firstClassify != nil && firstClassify.BaseFromMysteelChemicalClassifyId > 0 && firstClassify.Sort == 0 {
 			updateSortStr := ` sort + 1 `
 			_ = data_manage.UpdateBaseFromMysteelChemicalIndexByClassifyId(firstClassify.BaseFromMysteelChemicalClassifyId, 0, firstClassify.BaseFromMysteelChemicalIndexId-1, updateSortStr)
 		}

services/data/stl/stl.go

@@ -1003,6 +1003,9 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		}
 		pars = append(pars, req.EdbName)
 
+		condition += " AND edb_info_id !=? "
+		pars = append(pars, req.EdbInfoId)
+
 		existEdbInfo, er := data_manage.GetEdbInfoByCondition(condition, pars)
 		if er != nil && !utils.IsErrNoRow(er) {
 			msg = "获取失败"
@@ -1010,13 +1013,13 @@ func SaveStlEdbInfo(req *request.SaveStlEdbInfoReq, adminId int, adminRealName,
 		}
 		switch lang {
 		case utils.EnLangVersion:
-			if existEdbInfo != nil && existEdbInfo.EdbNameEn == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
+			if existEdbInfo != nil && existEdbInfo.EdbInfoId > 0 && existEdbInfo.EdbNameEn == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
 				msg = "指标名称已存在"
 				err = fmt.Errorf("指标名称已存在")
 				return
 			}
 		default:
-			if existEdbInfo != nil && existEdbInfo.EdbName == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
+			if existEdbInfo != nil && existEdbInfo.EdbInfoId > 0 && existEdbInfo.EdbName == req.EdbName && req.EdbInfoId != existEdbInfo.EdbInfoId {
 				msg = "指标名称已存在"
 				err = fmt.Errorf("指标名称已存在")
 				return