Merge branch 'cygx_9.0' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/micro_roadshow.go

@@ -318,6 +318,17 @@ type MicroRoadshowCollectReq struct {
 	SourceType int `description:"视频来源: 1-音频; 2-活动视频; 3-微路演视频 (不传默认为1)"`
 }
 
+// GetMicroRoadshowVideoListBycondition 根据搜索条件获取搜索列表
+func GetMicroRoadshowVideoListBycondition(condition string, pars []interface{}, startSize, pageSize int) (list []*MicroRoadshowVideo, err error) {
+	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE  1 =1 `
+	if condition != "" {
+		sql += condition
+	}
+	sql += `  LIMIT ?,? `
+	_, err = orm.NewOrm().Raw(sql, pars, startSize, pageSize).QueryRows(&list)
+	return
+}
+
 // GetMicroRoadshowVideoList 获取已经发布的微路演视频
 func GetMicroRoadshowVideoList() (list []*MicroRoadshowVideo, err error) {
 	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE  publish_status = 1`
@@ -333,14 +344,3 @@ func GetMicroRoadshowVideoByIndustryIdCount(industryId int) (count int, err erro
 	err = o.Raw(sql, industryId).QueryRow(&count)
 	return
 }
-
-// GetMicroRoadshowVideoListBycondition 根据搜索条件获取搜索列表
-func GetMicroRoadshowVideoListBycondition(condition string, pars []interface{}, startSize, pageSize int) (list []*MicroRoadshowVideo, err error) {
-	sql := `SELECT * FROM cygx_micro_roadshow_video WHERE  1 =1 `
-	if condition != "" {
-		sql += condition
-	}
-	sql += `  LIMIT ?,? `
-	_, err = orm.NewOrm().Raw(sql, pars, startSize, pageSize).QueryRows(&list)
-	return
-}