Merge branch 'cygx_8.7' into debug

controllers/activity.go

@@ -1061,13 +1061,13 @@ func (this *ActivityCoAntroller) Detail() {
 	collectCount1, err := models.GetActivityVoiceCollectCount(uid, activityId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已收藏失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(activityId)
+		br.ErrMsg = "判断是否已收藏失败，Err:" + strconv.Itoa(uid) + ";activityId" + strconv.Itoa(activityId)
 		return
 	}
 	collectCount2, err := models.GetActivityVideoCollectCountByActivityId(uid, activityId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取信息失败"
-		br.ErrMsg = "判断是否已收藏失败，Err:" + strconv.Itoa(uid) + ";articleId" + strconv.Itoa(activityId)
+		br.ErrMsg = "判断是否已收藏失败，Err:" + strconv.Itoa(uid) + ";activityId" + strconv.Itoa(activityId)
 		return
 	}
 	if collectCount1+collectCount2 > 0 {

models/article_collect.go

@@ -240,7 +240,7 @@ FROM
 WHERE
 	c.user_id =? 
 	AND vd.activity_id =? 
-	AND c.activity_voice_id = vd.activity_voice_id`
+	AND c.activity_video_id = vd.video_id`
 	err = orm.NewOrm().Raw(sql, userId, activityId,).QueryRow(&count)
 	return
 }