|
@@ -74,7 +74,7 @@ type ArticleCollectList struct {
|
|
|
|
|
|
func GetCygxArticleCollectList(condition string) (items []*CygxArticleCollect, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := `SELECT * FROM cygx_article_collect WHERE 1 =1 ` + condition + ` GROUP BY user_id `
|
|
|
+ sql := `SELECT * FROM cygx_article_collect WHERE 1 =1 AND article_id > 0 ` + condition + ` GROUP BY user_id `
|
|
|
_, err = o.Raw(sql).QueryRows(&items)
|
|
|
return
|
|
|
}
|
|
@@ -226,7 +226,7 @@ WHERE
|
|
|
c.user_id =?
|
|
|
AND vc.activity_id =?
|
|
|
AND c.activity_voice_id = vc.activity_voice_id`
|
|
|
- err = orm.NewOrm().Raw(sql, userId, activityId,).QueryRow(&count)
|
|
|
+ err = orm.NewOrm().Raw(sql, userId, activityId).QueryRow(&count)
|
|
|
|
|
|
return
|
|
|
}
|
|
@@ -241,6 +241,6 @@ WHERE
|
|
|
c.user_id =?
|
|
|
AND vd.activity_id =?
|
|
|
AND c.activity_video_id = vd.video_id`
|
|
|
- err = orm.NewOrm().Raw(sql, userId, activityId,).QueryRow(&count)
|
|
|
+ err = orm.NewOrm().Raw(sql, userId, activityId).QueryRow(&count)
|
|
|
return
|
|
|
-}
|
|
|
+}
|