删除知识资源分类

controllers/knowledge_classify.go

@@ -53,6 +53,7 @@ func (this *KnowledgeClassifyController) Add() {
 	br.Msg = "新增成功"
 }
 
+// CheckDeleteClassify
 // @Title 删除分类-检测接口
 // @Description 删除分类-信息检测，是否符合删除条件
 // @Param   ClassifyId   query   int  true       "分类ID"

models/knowledge/knowledge_classify.go

@@ -56,7 +56,7 @@ func (k *KnowledgeClassify) GetReportCountByClassifyId(classifyId int) (count in
 func (k *KnowledgeClassify) GetClassifySubCountByClassifyId(classifyId int) (count int, err error) {
 
 	sql := `SELECT COUNT(1) as num FROM knowledge_classify AS a
-        INNER JOIN knowledge_resource AS b ON a.id=b.classify_id_second
+        INNER JOIN knowledge_resource AS b ON a.classify_id=b.classify_id
         WHERE a.parent_id=? `
 	//o := orm.NewOrmUsingDB("rddp")
 	//err = o.Raw(sql, classifyId).QueryRow(&count)
@@ -307,15 +307,15 @@ type RelateTelSecClassifyWithPermissions struct {
 }
 
 // UpdateClassifySortByParentId 根据父类id更新排序
-func (k *KnowledgeClassify) UpdateClassifySortByParentId(parentId, permissionId, nowSort int, updateSort string) (err error) {
+func (k *KnowledgeClassify) UpdateClassifySortByParentId(parentId, permissionId, nowSort int, updateSort string, resourceType int) (err error) {
 
-	sql := ` update knowledge_classify set sort = ` + updateSort + ` WHERE parent_id=? AND sort > ? `
+	sql := ` update knowledge_classify set sort = ` + updateSort + ` WHERE parent_id=? AND resource_type=? AND sort > ? `
 	if permissionId > 0 {
 		sql += ` or ( classify_id > ` + fmt.Sprint(permissionId) + ` and sort = ` + fmt.Sprint(nowSort) + `)`
 	}
 	//o := orm.NewOrmUsingDB("rddp")
 	//_, err = o.Raw(sql, parentId, nowSort).Exec()
-	err = global.DmSQL["rddp"].Exec(sql, parentId, nowSort).Error
+	err = global.DmSQL["rddp"].Exec(sql, parentId, resourceType, nowSort).Error
 	return
 }
 

services/knowledge/classify.go

@@ -85,12 +85,12 @@ func MoveKnowledgeClassify(req knowledge.ClassifyMoveReq) (err error, errMsg str
 		nextSort = nextClassify.Sort
 	}
 
-	err, errMsg = moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify, parentClassifyId, prevSort, nextSort)
+	err, errMsg = moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify, parentClassifyId, prevSort, nextSort, classifyInfo.ResourceType)
 	return
 }
 
 // moveKnowledgeClassify 移动分类
-func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.KnowledgeClassify, parentId, prevSort, nextSort int) (err error, errMsg string) {
+func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.KnowledgeClassify, parentId, prevSort, nextSort, resourceType int) (err error, errMsg string) {
 	knowledgeObj := new(knowledge.KnowledgeClassify)
 	updateCol := make([]string, 0)
 
@@ -112,9 +112,9 @@ func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.K
 
 				//变更分类
 				if prevClassify != nil {
-					_ = knowledgeObj.UpdateClassifySortByParentId(parentId, prevClassify.ClassifyId, prevClassify.Sort, updateSortStr)
+					_ = knowledgeObj.UpdateClassifySortByParentId(parentId, prevClassify.ClassifyId, prevClassify.Sort, updateSortStr, resourceType)
 				} else {
-					_ = knowledgeObj.UpdateClassifySortByParentId(parentId, 0, prevSort, updateSortStr)
+					_ = knowledgeObj.UpdateClassifySortByParentId(parentId, 0, prevSort, updateSortStr, resourceType)
 				}
 
 			} else {
@@ -125,9 +125,9 @@ func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.K
 
 					//变更分类
 					if prevClassify != nil {
-						_ = knowledgeObj.UpdateClassifySortByParentId(parentId, prevClassify.ClassifyId, prevSort, updateSortStr)
+						_ = knowledgeObj.UpdateClassifySortByParentId(parentId, prevClassify.ClassifyId, prevSort, updateSortStr, resourceType)
 					} else {
-						_ = knowledgeObj.UpdateClassifySortByParentId(parentId, 0, prevSort, updateSortStr)
+						_ = knowledgeObj.UpdateClassifySortByParentId(parentId, 0, prevSort, updateSortStr, resourceType)
 					}
 
 				}
@@ -161,7 +161,7 @@ func moveKnowledgeClassify(classifyInfo, prevClassify, nextClassify *knowledge.K
 		//如果该分类下存在其他分类，且第一个其他分类的排序等于0，那么需要调整排序
 		if firstPermission != nil && firstPermission.ClassifyId != 0 && firstPermission.Sort == 0 {
 			updateSortStr := ` sort + 1 `
-			_ = knowledgeObj.UpdateClassifySortByParentId(parentId, firstPermission.ClassifyId-1, 0, updateSortStr)
+			_ = knowledgeObj.UpdateClassifySortByParentId(parentId, firstPermission.ClassifyId-1, 0, updateSortStr, resourceType)
 		}
 
 		classifyInfo.Sort = 0 //那就是排在第一位
@@ -195,20 +195,19 @@ func AddKnowledgeClassify(classifyName string, parentId, resourceType int) (err
 	isSendEmail = true
 	errMsg = `添加失败`
 	knowledgeObj := new(knowledge.KnowledgeClassify)
-	item, err := knowledgeObj.GetClassifyByName(classifyName, parentId, resourceType)
+	_, err = knowledgeObj.GetClassifyByName(classifyName, parentId, resourceType)
 	if err != nil && !utils.IsErrNoRow(err) {
 		errMsg = "获取分类信息失败"
-		if utils.IsErrNoRow(err) {
-			errMsg = "分类名称:" + classifyName + "已存在"
-			isSendEmail = false
-		}
 		return
 	}
-	if item != nil {
+
+	if err == nil {
 		errMsg = "分类名称:" + classifyName + "已存在"
 		isSendEmail = false
 		err = errors.New(errMsg)
 		return
+	} else {
+		err = nil
 	}
 
 	level := 1
@@ -383,7 +382,7 @@ func EditKnowledgeClassify(classifyId, parentId int, classifyName string) (err e
 		err = errors.New("获取重名分类失败, Err: " + err.Error())
 		return
 	}
-	if existName != nil && existName.ClassifyId != item.ClassifyId {
+	if existName != nil && existName.ClassifyId > 0 && existName.ClassifyId != item.ClassifyId {
 		errMsg = "分类名称:" + classifyName + "已存在"
 		err = errors.New(errMsg)
 		isSendEmail = false