Browse Source

过滤空的音频

xiexiaoyuan 3 years ago
parent
commit
9ffc164746
2 changed files with 8 additions and 6 deletions
  1. 7 5
      services/report/report.go
  2. 1 1
      services/report/report_chapter.go

+ 7 - 5
services/report/report.go

@@ -725,11 +725,13 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 					}
 				}
 			}else if authOk,ok := checkPermissionMap[reportInfo.ClassifyNameSecond]; ok && authOk {
-				videoTemp := new(response.VideoListItem)
-				videoTemp.VideoUrl = reportInfo.VideoUrl
-				videoTemp.VideoName = reportInfo.VideoName
-				videoTemp.VideoPlaySeconds = reportInfo.VideoPlaySeconds
-				reportItem.VideoList = append(reportItem.VideoList, videoTemp)
+				if  reportInfo.VideoUrl != "" {
+					videoTemp := new(response.VideoListItem)
+					videoTemp.VideoUrl = reportInfo.VideoUrl
+					videoTemp.VideoName = reportInfo.VideoName
+					videoTemp.VideoPlaySeconds = reportInfo.VideoPlaySeconds
+					reportItem.VideoList = append(reportItem.VideoList, videoTemp)
+				}
 				reportItem.AuthOk = authOk
 			}
 

+ 1 - 1
services/report/report_chapter.go

@@ -378,7 +378,7 @@ func GetReportChapterVideoList(permissionIds []int, classifyName string, list []
 		if classifyName == "周报" {
 			weekAuthMap[v.ReportId] = true
 		}
-		if temp, ok := typeMap[v.TypeId]; ok {
+		if temp, ok := typeMap[v.TypeId]; ok && v.VideoUrl != "" {
 			if reportDetail, ok1 := reportMap[v.ReportId]; ok1 {
 				reportDate := reportDetail.CreateTime
 				if reportDate.Before(temp.PauseStartTime) || reportDate.After(temp.PauseEndTime) {