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

services/micro_roadshow.go

@@ -188,7 +188,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 	//audioCond += ` AND b.activity_time > ? `
 	//audioPars = append(audioPars, endTime)
 	if keywords != "" {
-		audioCond += ` AND a.voice_name LIKE ? OR b.label LIKE ?`
+		audioCond += ` AND ( a.voice_name LIKE ? OR b.label LIKE ? )`
 		audioPars = append(audioPars, keywords, keywords)
 	}
 	if audioId > 0 {
@@ -280,9 +280,12 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 func CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter int, keywordArr []string, audioIds, videoIds, activityVideoIds string) (total int, err error) {
 	var e error
 	var keywords string
-	if len(keywordArr) > 1 {
+	if len(keywordArr) > 0 {
 		keywords = KeyWordArrSqlRegexpAll(keywordArr)
 	}
+	//if keywords == "" {
+	//	return
+	//}
 	//音频的查询
 	var audioCond string
 	var audioPars []interface{}
@@ -293,7 +296,7 @@ func CountMicroRoadShowPageListIkWord(audioId, videoId, activityVideoId, filter
 	// 活动已发布且已结束
 	audioCond += ` AND b.publish_status = 1 AND b.active_state = 3`
 	if keywords != "" {
-		audioCond += ` AND a.voice_name REGEXP ? OR b.label REGEXP ?`
+		audioCond += ` AND (a.voice_name REGEXP ? OR b.label REGEXP ? ) `
 		audioPars = append(audioPars, keywords, keywords)
 	}
 	if audioId > 0 {
@@ -551,7 +554,7 @@ func GetMicroRoadShowMycollect(pageSize, currentIndex int, audioIds, videoIds, a
 	return
 }
 
-//GetMicroRoadshowVideoMap 获取已经发布的微路演的产业ID
+// GetMicroRoadshowVideoMap 获取已经发布的微路演的产业ID
 func GetMicroRoadshowVideoMap() (items map[int]int, err error) {
 	list, e := models.GetMicroRoadshowVideoList()
 	if e != nil && e.Error() != utils.ErrNoRow() {