指标移动重名名

models/data_manage/base_from_ths_hf_classify.go

@@ -304,3 +304,11 @@ func UpdateThsHfClassifyChildByParentClassifyId(classifyIds []int, rootId int, l
 
 	return
 }
+
+// GetThsHfClassifyByParentIdAndName 根据父级ID和名称获取分类
+func GetThsHfClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *BaseFromThsHfClassify, err error) {
+	sql := `SELECT * FROM base_from_ths_hf_classify WHERE parent_id = ? AND classify_name = ? AND base_from_ths_hf_classify_id <> ? LIMIT 1`
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+
+	return
+}

models/data_manage/edb_classify.go

@@ -678,9 +678,9 @@ where classify_id IN (` + utils.GetOrmInReplace(len(classifyIds)) + `)`
 }
 
 // GetEdbClassifyByParentIdAndName 根据父级ID和名称获取分类
-func GetEdbClassifyByParentIdAndName(parentId int, classifyName string, classifyId int) (item *EdbClassify, err error) {
-	sql := `SELECT * FROM edb_classify WHERE parent_id = ? AND classify_name = ? AND classify_id <> ? LIMIT 1`
-	err = global.DmSQL["data"].Raw(sql, parentId, classifyName, classifyId).First(&item).Error
+func GetEdbClassifyByParentIdAndName(parentId int, classifyName string, classifyId int, classifyType uint8) (item *EdbClassify, err error) {
+	sql := `SELECT * FROM edb_classify WHERE parent_id = ? AND classify_name = ? AND classify_id <> ? and classify_type=? LIMIT 1`
+	err = global.DmSQL["data"].Raw(sql, parentId, classifyName, classifyId, classifyType).First(&item).Error
 
 	return
 }

services/data/base_from_ths_hf_classify.go

@@ -85,7 +85,7 @@ func ThsHfMoveClassify(req data_manage.BaseFromThsHfClassifyMoveReq, sysUser *sy
 			return
 		}
 		// 如果是移动目录, 那么校验一下父级目录下是否有重名目录
-		exists, e := data_manage.GetEdbClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId)
+		exists, e := data_manage.GetThsHfClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId)
 		if e != nil && !utils.IsErrNoRow(e) {
 			errMsg = "移动失败"
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())

services/data/edb_classify.go

@@ -1040,7 +1040,7 @@ func MoveEdbClassify(req data_manage.MoveEdbClassifyReq, sysUser *system.Admin,
 			return
 		}
 		// 如果是移动目录, 那么校验一下父级目录下是否有重名目录
-		exists, e := data_manage.GetEdbClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId)
+		exists, e := data_manage.GetEdbClassifyByParentIdAndName(parentClassifyId, edbClassifyInfo.ClassifyName, classifyId, classifyType)
 		if e != nil && !utils.IsErrNoRow(e) {
 			errMsg = "移动失败"
 			err = fmt.Errorf("获取父级分类下的同名分类失败, Err: %s", e.Error())