Merge branch 'cygx_5.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/research.go

@@ -98,7 +98,7 @@ func (this *ResearchController) CollectionList() {
 		return
 	}
 	var condition string
-	condition = `  AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 GROUP BY m.industrial_management_id ORDER BY collect_num DESC, publish_date DESC LIMIT 15 `
+	condition = `  AND a.category_name LIKE '%` + categoryinfo.PermissionName + `%' AND publish_status = 1 GROUP BY a.article_id ORDER BY collect_num DESC, publish_date DESC LIMIT 15 `
 	list, err := models.GetArticleCollectionList(condition, user.UserId)
 	if err != nil {
 		br.Msg = "获取信息失败"