|
@@ -197,8 +197,8 @@ func CountMicroRoadShowVideoPageList(condition string, pars []interface{}, condi
|
|
|
func GetMicroRoadShowVideoPageListIkWord(startSize, pageSize int, condition string, pars []interface{}, conditionAct string, parsAct []interface{}, conditionAudio string, parsAudio []interface{}, audioId, videoId, activityVideoId, filter int) (list []*MicroRoadShowPageList, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
var sql string
|
|
|
- if audioId+activityVideoId == 0 && filter != 2 {
|
|
|
- sql += `SELECT
|
|
|
+ //if audioId+activityVideoId == 0 && filter != 2 {
|
|
|
+ sql += `SELECT
|
|
|
video_id AS id,
|
|
|
video_name AS title,
|
|
|
video_url AS resource_url,
|
|
@@ -215,16 +215,16 @@ func GetMicroRoadShowVideoPageListIkWord(startSize, pageSize int, condition stri
|
|
|
cygx_micro_roadshow_video
|
|
|
WHERE
|
|
|
publish_status = 1 `
|
|
|
- if condition != `` {
|
|
|
- sql += condition
|
|
|
- }
|
|
|
- }
|
|
|
- if audioId+videoId+activityVideoId == 0 && filter != 2 {
|
|
|
- sql += ` UNION ALL `
|
|
|
+ if condition != `` {
|
|
|
+ sql += condition
|
|
|
}
|
|
|
-
|
|
|
- if audioId+videoId == 0 && filter != 2 {
|
|
|
- sql += `
|
|
|
+ //}
|
|
|
+ //if audioId+videoId+activityVideoId == 0 && filter != 2 {
|
|
|
+ // sql += ` UNION ALL `
|
|
|
+ //}
|
|
|
+ sql += ` UNION ALL `
|
|
|
+ //if audioId+videoId == 0 && filter != 2 {
|
|
|
+ sql += `
|
|
|
SELECT
|
|
|
video_id AS id,
|
|
|
video_name AS title,
|
|
@@ -241,16 +241,16 @@ func GetMicroRoadShowVideoPageListIkWord(startSize, pageSize int, condition stri
|
|
|
FROM
|
|
|
cygx_activity_video as v
|
|
|
INNER JOIN cygx_activity as art on art.activity_id = v.activity_id WHERE 1= 1 `
|
|
|
- if conditionAct != `` {
|
|
|
- sql += conditionAct
|
|
|
- }
|
|
|
- }
|
|
|
- if audioId+videoId+activityVideoId == 0 && filter == 0 {
|
|
|
- sql += ` UNION ALL `
|
|
|
+ if conditionAct != `` {
|
|
|
+ sql += conditionAct
|
|
|
}
|
|
|
-
|
|
|
- if videoId+activityVideoId == 0 && filter != 1 {
|
|
|
- sql += `
|
|
|
+ //}
|
|
|
+ //if audioId+videoId+activityVideoId == 0 && filter == 0 {
|
|
|
+ // sql += ` UNION ALL `
|
|
|
+ //}
|
|
|
+ sql += ` UNION ALL `
|
|
|
+ //if videoId+activityVideoId == 0 && filter != 1 {
|
|
|
+ sql += `
|
|
|
SELECT
|
|
|
a.activity_voice_id AS id,
|
|
|
a.voice_name AS title,
|
|
@@ -267,10 +267,10 @@ func GetMicroRoadShowVideoPageListIkWord(startSize, pageSize int, condition stri
|
|
|
FROM
|
|
|
cygx_activity_voice AS a
|
|
|
JOIN cygx_activity AS b ON a.activity_id = b.activity_id WHERE 1= 1 `
|
|
|
- if conditionAudio != `` {
|
|
|
- sql += conditionAudio
|
|
|
- }
|
|
|
+ if conditionAudio != `` {
|
|
|
+ sql += conditionAudio
|
|
|
}
|
|
|
+ //}
|
|
|
sql += ` ORDER BY publish_time DESC`
|
|
|
sql += ` LIMIT ?,?`
|
|
|
_, err = o.Raw(sql, pars, parsAct, parsAudio, startSize, pageSize).QueryRows(&list)
|