|
@@ -104,17 +104,19 @@ func GetMicroRoadShowPageList(pageSize, currentIndex, audioId, videoId int, keyw
|
|
|
for i := 0; i < sliceNum; i++ {
|
|
|
|
|
|
for a := 0; a < audioRatio; a++ {
|
|
|
- if audioNum < audioLen {
|
|
|
- respList = append(respList, audioList[audioNum])
|
|
|
- audioNum += 1
|
|
|
+ if audioNum >= audioLen {
|
|
|
+ break
|
|
|
}
|
|
|
+ respList = append(respList, audioList[audioNum])
|
|
|
+ audioNum += 1
|
|
|
}
|
|
|
|
|
|
for b := 0; b < videoRatio; b++ {
|
|
|
- if videoNum < videoLen {
|
|
|
- respList = append(respList, videoList[videoNum])
|
|
|
- videoNum += 1
|
|
|
+ if videoNum >= videoLen {
|
|
|
+ break
|
|
|
}
|
|
|
+ respList = append(respList, videoList[videoNum])
|
|
|
+ videoNum += 1
|
|
|
}
|
|
|
}
|
|
|
total = audioTotal + videoTotal
|