过滤下架产品

domian/media/media_service.go

@@ -133,11 +133,15 @@ func SearchMaxMediaId(mediaType string, key string) (total int64, latestId int64
 	return
 }
 func GetMediaPermissionMappingByPermissionIds(mediaType string, permissionIds []int, riskLevel string) (total int64, latestId int64, ids []int, mappingPdRisk string) {
+	mediaIds, err := mediaDao.GetMediaPermissionMappingByPermissionId(mediaType, permissionIds)
+	if err != nil {
+		logger.Error("获取配置品种的媒体列表信息失败:%v", err)
+		return 0, 0, ids, riskLevel
+	}
 	//获取一下下架的报告产品
 	var offSaleProducts []merchantDao.MerchantProduct
-	offSaleProducts, err := merchantDao.GetOffSaleProducts([]merchantDao.MerchantProductType{transProductMap[mediaType], merchantDao.Package})
+	offSaleProducts, err = merchantDao.GetOffSaleProducts([]merchantDao.MerchantProductType{transProductMap[mediaType], merchantDao.Package})
 	var disCardMediaIds []int
-	var filterPermissionIds []int
 	var ProductPermissionIds []int
 	var filterIds []int
 	if err != nil {
@@ -154,28 +158,23 @@ func GetMediaPermissionMappingByPermissionIds(mediaType string, permissionIds []
 	}
 	if len(ProductPermissionIds) > 0 {
 		var disCardIds []int
-		disCardIds, err = mediaDao.GetMediaPermissionMappingByPermissionId(mediaType, filterPermissionIds)
+		disCardIds, err = mediaDao.GetMediaPermissionMappingByPermissionId(mediaType, ProductPermissionIds)
 		if len(disCardMediaIds) > 0 {
 			disCardMediaIds = append(disCardMediaIds, disCardIds...)
 		}
 	}
 	//对数据去重
 	disCardMediaIds = uniqueArray(disCardMediaIds)
-	ids, err = mediaDao.GetMediaPermissionMappingByPermissionId(mediaType, filterPermissionIds)
-	if err != nil {
-		logger.Error("获取配置品种的媒体列表信息失败:%v", err)
-		return 0, 0, ids, riskLevel
-	}
 	//获取媒体中还包含上架套餐的id
 	if len(disCardMediaIds) > 0 {
-		reportIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds, transProductMap[mediaType])
-		reportIdsSaleProduct, _ := merchantDao.GetOnSaleMediaIds(disCardMediaIds, transProductMap[mediaType])
+		mediaIdsSalePackage, _ := merchantDao.GetMediaOnSalePackageIds(disCardMediaIds, transProductMap[mediaType])
+		mediaIdsSaleProduct, _ := merchantDao.GetOnSaleMediaIds(disCardMediaIds, transProductMap[mediaType])
 		showReportMap := make(map[int]bool)
 		disCardMap := make(map[int]bool)
-		for _, reportId := range reportIdsSalePackage {
+		for _, reportId := range mediaIdsSalePackage {
 			showReportMap[reportId] = true
 		}
-		for _, reportId := range reportIdsSaleProduct {
+		for _, reportId := range mediaIdsSaleProduct {
 			showReportMap[reportId] = true
 		}
 		var filterDisCardReportIds []int
@@ -186,13 +185,13 @@ func GetMediaPermissionMappingByPermissionIds(mediaType string, permissionIds []
 			}
 		}
 		disCardMediaIds = filterDisCardReportIds
-		var cardReportIds []int
-		for _, id := range filterIds {
+		for _, id := range mediaIds {
 			if _, ok := disCardMap[id]; !ok {
-				cardReportIds = append(cardReportIds, id)
+				filterIds = append(filterIds, id)
 			}
 		}
-		filterIds = cardReportIds
+	} else {
+		filterIds = mediaIds
 	}
 	if len(filterIds) > 0 {
 		sort.Slice(filterIds, func(i, j int) bool {