浏览代码

fix:分类展示

zqbao 3 月之前
父节点
当前提交
fa07e4d66f
共有 2 个文件被更改,包括 14 次插入1 次删除
  1. 11 0
      models/knowledge/knowledge_resource.go
  2. 3 1
      services/knowledge_approve/knowledge_approve_flow.go

+ 11 - 0
models/knowledge/knowledge_resource.go

@@ -97,6 +97,17 @@ func GetBatchKnowledgeResource(batchSize int, id int) (items []*KnowledgeResourc
 	return
 	return
 }
 }
 
 
+func GetBatchKnowledgeResourceByCondition(condition string, pars []interface{}, batchSize int) (items []*KnowledgeResource, err error) {
+	sql := `SELECT * FROM knowledge_resource WHERE is_delete=0 `
+	if condition != "" {
+		sql += condition
+	}
+	pars = append(pars, batchSize)
+	sql += `ORDER BY knowledge_resource_id ASC LIMIT ?`
+	err = global.DmSQL["rddp"].Raw(sql, pars...).Find(&items).Error
+	return
+}
+
 func GetKnowledgeResourcePageList(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeResource, err error) {
 func GetKnowledgeResourcePageList(condition string, pars []interface{}, startSize, pageSize int) (items []*KnowledgeResource, err error) {
 	sql := `SELECT * FROM knowledge_resource WHERE 1=1  AND is_delete=0 `
 	sql := `SELECT * FROM knowledge_resource WHERE 1=1  AND is_delete=0 `
 	if condition != "" {
 	if condition != "" {

+ 3 - 1
services/knowledge_approve/knowledge_approve_flow.go

@@ -51,9 +51,11 @@ func GetKnowledgeResourceApproveFlowList(condition string, pars []interface{}, s
 		if _, ok := classifyPathMap[classify.ClassifyId]; !ok {
 		if _, ok := classifyPathMap[classify.ClassifyId]; !ok {
 			classifyPathMap[classify.ClassifyId] = make(map[int]string)
 			classifyPathMap[classify.ClassifyId] = make(map[int]string)
 		}
 		}
+
+		currClassifyMap := classifyPathMap[classify.ClassifyId]
 		currClassify := classify
 		currClassify := classify
 		for i := classify.Level; i > 0; i-- {
 		for i := classify.Level; i > 0; i-- {
-			classifyPathMap[currClassify.ClassifyId][currClassify.Level] = currClassify.ClassifyName
+			currClassifyMap[currClassify.Level] = currClassify.ClassifyName
 			if currClassify.ParentId == 0 {
 			if currClassify.ParentId == 0 {
 				break
 				break
 			}
 			}