Merge branch 'need/cygx_990' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/activity_video.go

@@ -162,7 +162,7 @@ func GetActivityVideoActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_video AS a AND is_hide = 0 `
+				cygx_activity_video AS a WHERE is_hide = 0 `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return

models/activity_voice.go

@@ -118,7 +118,7 @@ func GetActivityVoiceActivityIds() (activityIds string, err error) {
 	sql := `SELECT
 				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
 			FROM
-				cygx_activity_voice AS a  AND is_hide = 0  `
+				cygx_activity_voice AS a  WHERE  is_hide = 0  `
 	o := orm.NewOrm()
 	err = o.Raw(sql).QueryRow(&activityIds)
 	return