Merge branch 'cygx_8.7' into debug

services/micro_roadshow.go

@@ -202,6 +202,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 			for _, v := range sliceId {
 				idSqlStr += "'" + v + "',"
 			}
+			idSqlStr = strings.TrimRight(idSqlStr, ",")
 			audioCond += ` AND a.activity_voice_id IN (` + idSqlStr + `)`
 		}
 	}
@@ -234,6 +235,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 			for _, v := range sliceId {
 				idSqlStr += "'" + v + "',"
 			}
+			idSqlStr = strings.TrimRight(idSqlStr, ",")
 			videoCondAct += ` AND v.video_id IN (` + idSqlStr + `)`
 		}
 
@@ -255,6 +257,7 @@ func GetMicroRoadShowPageListV8(pageSize, currentIndex, audioId, videoId, activi
 			for _, v := range sliceId {
 				idSqlStr += "'" + v + "',"
 			}
+			idSqlStr = strings.TrimRight(idSqlStr, ",")
 			videoCond += ` AND video_id IN (` + idSqlStr + `)`
 		}
 		videoCond += ` AND publish_status = 1`