添加报告搜索记录ReortSearch

controllers/report.go

@@ -1740,6 +1740,14 @@ func (this *ReportController) IndustryAndArticleList() {
 			artList[k2].IndustryName = industryName + "-" + subjectNamesNew
 		}
 	}
+	if keyWord != "" {
+		keyWordItem := new(models.CygxUserSearchKeyWord)
+		keyWordItem.UserId = user.UserId
+		keyWordItem.KeyWord = keyWord
+		keyWordItem.PageType = "ReortSearch"
+		keyWordItem.CreateTime = time.Now()
+		go models.AddUserSearchKeyWord(keyWordItem)
+	}
 	resp := new(models.CygxIndustrySearchList)
 	resp.ArtList = artList
 	resp.IndList = list

models/activity_help_ask.go

@@ -55,7 +55,7 @@ func GetActivityAskList(userId int) (items []*CygxAskList, err error) {
 			cygx_activity_help_ask AS k
 			INNER JOIN cygx_activity AS a ON a.activity_id = k.activity_id 
 		WHERE
-			user_id = ? a.publish_status = 1 ORDER BY k.ask_id DESC`
+			user_id = ? AND a.publish_status = 1 ORDER BY k.ask_id DESC`
 	_, err = o.Raw(sql, userId).QueryRows(&items)
 	return
 }

models/user.go

@@ -136,14 +136,14 @@ type CheckStatusResp struct {
 }
 
 func GetArticleUserCollectCount(userId int) (count int, err error) {
-	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id WHERE a.user_id=? AND publish_status = 1  `
+	sql := `SELECT COUNT(1) AS count FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id WHERE a.user_id=? AND art.publish_status = 1  `
 	err = orm.NewOrm().Raw(sql, userId).QueryRow(&count)
 	return
 }
 
 func GetArticleUserCollectList(startSize, pageSize, userId int) (items []*ArticleCollectList, err error) {
 	sql := `SELECT a.* FROM cygx_article_collect AS a INNER JOIN cygx_article as art ON art.article_id = a.article_id
-			WHERE a.user_id=?  AND publish_status = 1
+			WHERE a.user_id=?  AND art.publish_status = 1
            ORDER BY a.create_time DESC LIMIT ?,? `
 	_, err = orm.NewOrm().Raw(sql, userId, startSize, pageSize).QueryRows(&items)
 	return