标签列表

controllers/knowledge_resource.go

@@ -145,25 +145,29 @@ func (this *KnowledgeResourceController) List() {
 		classifyFullNameMap[v.ClassifyId] = name
 	}
 
-	/* // 整理标签ID
-	    tagNameMap := make(map[int]string)
-	    tagIdsArr := make([]int, 0)
-	    for _, v := range listTmp {
-	        tagIdsArr = append(tagIdsArr, v.TagId)
-	    }
-	    // 获取标签列表
-	    tagList, err := knowledge.GetTagListByIdList(tagIdsArr)
-	    if err != nil {
-	        br.Msg = "获取失败"
-	        br.ErrMsg = "获取失败，Err:" + err.Error()
-		}*/
+	// 整理标签ID
+	tagNameMap := make(map[int]string)
+	tagIdsArr := make([]int, 0)
+	for _, v := range listTmp {
+		tagIdsArr = append(tagIdsArr, v.TagId)
+	}
+	// 获取标签列表
+	tagObj := new(knowledge.KnowledgeTag)
+	tagList, err := tagObj.GetListByIdList(tagIdsArr)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+	}
+	for _, v := range tagList {
+		tagNameMap[v.TagId] = v.TagName
+	}
 
 	for _, v := range listTmp {
 		var startTime, endTime string
-		if !v.StartTime.IsZero() {
+		if v.StartTime != nil && !v.StartTime.IsZero() {
 			startTime = v.StartTime.In(time.Local).Format(utils.FormatDateTime)
 		}
-		if !v.EndTime.IsZero() {
+		if v.EndTime != nil && !v.EndTime.IsZero() {
 			endTime = v.EndTime.In(time.Local).Format(utils.FormatDateTime)
 		}
 		modifyTime := v.ModifyTime.In(time.Local).Format(utils.FormatDateTime)
@@ -201,10 +205,10 @@ func (this *KnowledgeResourceController) List() {
 		if ok {
 			tmp.ClassifyFullName = classifyName
 		}
-		/*tagName, ok := tagNameMap[v.TagId]
+		tagName, ok := tagNameMap[v.TagId]
 		if ok {
-			v.TagName = tagName
-		*/
+			tmp.TagName = tagName
+		}
 		list = append(list, tmp)
 	}
 

models/knowledge/knowledge_tag.go

@@ -236,18 +236,7 @@ func (m *KnowledgeTag) GetTagListByKeyword(keyWord string) (items []*KnowledgeTa
 	return
 }
 
-func (m *KnowledgeTag) GetTagListByParentIdList(parentTagIdList []int) (items []*KnowledgeTagItem, err error) {
-	num := len(parentTagIdList)
-	if num <= 0 {
-		return
-	}
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE tag_id in (?) ORDER BY sort ASC, create_time ASC`, m.TableName())
-
-	err = global.DmSQL["rddp"].Raw(sql, parentTagIdList).Find(&items).Error
-	return
-}
-
-func (m *KnowledgeTag) GetTagListByIdList(tagIdList []int) (items []*KnowledgeTag, err error) {
+func (m *KnowledgeTag) GetListByIdList(tagIdList []int) (items []*KnowledgeTag, err error) {
 	num := len(tagIdList)
 	if num <= 0 {
 		return