视频 音频过滤已删除的

models/media/media.go

@@ -52,7 +52,12 @@ func GetCountByMediaType(mediaType string) (count int64, latestId int64) {
 		return 0, 0
 	}
 	count = int64(len(ids))
-	latestId = int64(ids[0])
+	err = db.Model(&Media{}).Select("MAX(id) id ").Where("media_type = ? and deleted = ?", mediaType, false).Scan(&latestId).Error
+	if err != nil {
+		logger.Error("获取最新的媒体Id失败:%v", err)
+		return 0, 0
+	}
+	//latestId = int64(ids[0])
 	return
 }
 
@@ -78,7 +83,7 @@ func GetMediaPage(latestId int64, limit int, offset int, mediaType string) (medi
 		logger.Error("非法的limit参数:%d", limit)
 	}
 	db := models.Main()
-	err = db.Select(CommonColumns).Where("media_type= ? and id<= ?", mediaType, latestId).Order("created_time desc").Limit(limit).Offset(offset).Find(&mediaList).Error
+	err = db.Select(CommonColumns).Where("media_type= ? and id<= ? and deleted=?", mediaType, latestId, false).Order("created_time desc").Limit(limit).Offset(offset).Find(&mediaList).Error
 	return
 }
 func GetMediaPageByIds(latestId int64, limit int, offset int, mediaType string, mediasIds []int) (mediaList []Media, err error) {
@@ -95,7 +100,7 @@ func GetMediaPageByIds(latestId int64, limit int, offset int, mediaType string,
 		logger.Error("非法的limit参数:%d", limit)
 	}
 	db := models.Main()
-	err = db.Select(CommonColumns).Where(" id<= ? and media_type= ? and id in ?", latestId, mediaType, mediasIds).Order("created_time desc").Limit(limit).Offset(offset).Find(&mediaList).Error
+	err = db.Select(CommonColumns).Where(" id<= ? and media_type= ? and id in ? and deleted =?", latestId, mediaType, mediasIds, false).Order("created_time desc").Limit(limit).Offset(offset).Find(&mediaList).Error
 	return
 }
 func GetMediaPageByAnalystId(latestId int64, limit int, offset int, mediaType string, analystId int) (mediaList []Media, err error) {