xingzai před 2 roky
rodič
revize
d72b804826
2 změnil soubory, kde provedl 8 přidání a 8 odebrání
  1. 2 2
      models/micro_roadshow.go
  2. 6 6
      services/micro_roadshow.go

+ 2 - 2
models/micro_roadshow.go

@@ -96,7 +96,7 @@ func GetMicroRoadShowVideoPageListV8(startSize, pageSize int, condition string,
 			video_name AS title,
 			video_url AS resource_url,
 			2 AS type,
-		art.activity_time as publish_time,
+	    	art.activity_time as publish_time,
 			art.chart_permission_id,
 			art.chart_permission_name,
 			"" AS play_seconds,
@@ -506,7 +506,7 @@ func GetMicroRoadshowVideoList() (list []*MicroRoadshowVideo, err error) {
 	return
 }
 
-//GetMicroRoadshowVideoByIndustryIdCount  根据行业ID查询产业视频是否存在
+// GetMicroRoadshowVideoByIndustryIdCount  根据行业ID查询产业视频是否存在
 func GetMicroRoadshowVideoByIndustryIdCount(industryId int) (count int, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT COUNT(1) count

+ 6 - 6
services/micro_roadshow.go

@@ -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 {