hsun 2 rokov pred
rodič
commit
0ad0732d01
1 zmenil súbory, kde vykonal 8 pridanie a 6 odobranie
  1. 8 6
      services/micro_roadshow.go

+ 8 - 6
services/micro_roadshow.go

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