g过滤自由布局

services/report/report.go

@@ -626,7 +626,6 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 		reportDetail.RaiReportUrl = fmt.Sprintf("%s/v2/articles/%d?token=%s", global.CONFIG.RaiReportLib.ServerUrl, reportInfo.RaiReportId, global.CONFIG.RaiReportLib.Token)
 	}
 
-
 	// 如果分类配置是列表展示，那么就移除content内容
 	if minClassify.ReportDetailShowType == 2 {
 		for _, v := range reportTypeList {
@@ -874,6 +873,8 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 	var list []*report.Report
 	if keyWord == "" {
 		offset := (pageIndex - 1) * pageSize
+		//过滤自由布局的小程序
+		condition += ` AND report_layout IN (1,2) `
 		list, err = report.GetReportList(condition, pars, offset, pageSize)
 		if err != nil {
 			errMsg = err.Error()
@@ -958,16 +959,22 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 				err = errors.New("查询报告出错")
 				return
 			}
+			//过滤自由布局的小程序
 			reportListMap := make(map[int]*report.Report)
 			for _, temp := range reportInfoList {
-				reportListMap[temp.Id] = temp
+				if temp.ReportLayout != 3 {
+					reportListMap[temp.Id] = temp
+				}
 			}
+			var filterList []*report.Report
 			for k, reportDetail := range list {
 				if v, ok := reportListMap[reportDetail.Id]; ok {
 					list[k].CreateTime = v.CreateTime
 					list[k].RaiReportId = v.RaiReportId
+					filterList = append(filterList, list[k])
 				}
 			}
+			list = filterList
 		}
 	}
 
@@ -1074,7 +1081,7 @@ func GetReportList(user user.UserInfo, keyWord string, classifyIdFirst, classify
 			}
 			reportItem.ReportImgUrl = coverImg
 			reportItem.VideoImg = reportItem.ReportImgUrl
-			
+
 			if reportItem.HasChapter == 1 {
 				if classifyParent.ClassifyName == "晨报" && productAuthOk {
 					// 查询当前晨报的所有音频
@@ -1412,13 +1419,18 @@ func SearchReport(user user.UserInfo, keyWord string, pageIndex, pageSize int) (
 		}
 		reportListMap := make(map[int]*report.Report)
 		for _, temp := range reportInfoList {
-			reportListMap[temp.Id] = temp
+			if temp.ReportLayout != 3 {
+				reportListMap[temp.Id] = temp
+			}
 		}
+		var filterList []*response.ReportCollectListItem
 		for _, reportDetail := range reportList {
 			if v, ok := reportListMap[reportDetail.ReportId]; ok {
 				reportDetail.RaiReportId = v.RaiReportId
+				filterList = append(filterList, reportDetail)
 			}
 		}
+		reportList = filterList
 	}
 	ret = new(response.ReportSearchResp)
 	ret.List = reportList