Merge branch 'feature/8.4_industry_video' into debug

models/micro_roadshow.go

@@ -293,14 +293,14 @@ func UpdateCygxActivityVideoCounts(activityId int) (err error) {
 
 // GetMicroRoadshowVideoByIndustryIds 根据行业ID查询产业视频列表
 func GetMicroRoadshowVideoByIndustryIds(industrialIdArr []int) (list []*MicroRoadshowVideo, err error) {
-	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id in (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)   `
+	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id in (` + utils.GetOrmInReplace(len(industrialIdArr)) + `)  and publish_status = 1 `
 	_, err = orm.NewOrm().Raw(sql, industrialIdArr).QueryRows(&list)
 	return
 }
 
 // GetMicroRoadshowVideoByIndustryId 根据行业ID查询产业视频列表
 func GetMicroRoadshowVideoByIndustryId(industryId int) (item *MicroRoadshowVideo, err error) {
-	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id = ?`
+	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE industry_id = ? and publish_status = 1`
 	err = orm.NewOrm().Raw(sql, industryId).QueryRow(&item)
 	return
 }