|
@@ -216,8 +216,8 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
|
|
|
if keywords != "" {
|
|
|
videoCond += ` AND video_name LIKE ?`
|
|
|
videoPars = append(videoPars, keywords)
|
|
|
- videoCondAct += ` AND video_name LIKE ?`
|
|
|
- videoParsAct = append(videoParsAct, keywords)
|
|
|
+ videoCondAct += ` AND (video_name LIKE ? OR art.label LIKE ?)`
|
|
|
+ videoParsAct = append(videoParsAct, keywords, keywords)
|
|
|
}
|
|
|
if videoId > 0 {
|
|
|
videoCond += ` AND video_id = ?`
|
|
@@ -322,13 +322,13 @@ func CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter
|
|
|
// videoCond = ""
|
|
|
//} else {
|
|
|
if keywords != "" {
|
|
|
- videoCond += ` AND video_name REGEXP ?`
|
|
|
+ videoCond += ` AND video_name REGEXP ? `
|
|
|
videoPars = append(videoPars, keywords)
|
|
|
- videoCondAct += ` AND video_name REGEXP ?`
|
|
|
- videoParsAct = append(videoParsAct, keywords)
|
|
|
+ videoCondAct += ` AND (video_name REGEXP ? OR art.label REGEXP ? )`
|
|
|
+ videoParsAct = append(videoParsAct, keywords, keywords)
|
|
|
}
|
|
|
if videoId > 0 {
|
|
|
- videoCond += ` AND video_id = ?`
|
|
|
+ videoCond += ` AND video_id = ? `
|
|
|
videoPars = append(videoPars, videoId)
|
|
|
}
|
|
|
if activityVideoId > 0 {
|