|
|
@@ -914,9 +914,7 @@ public class PlanNewCommonOutController {
|
|
|
if (Set.of(6,7).contains(plan.type())) {
|
|
|
adBottom = template.select(Query.query(Criteria.where("type").is(2).and("group_type_id").is(plan.groupId())
|
|
|
.and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link,redirect_type,plan_type,plan_id,group_type_id".split(",")), Ad.class)
|
|
|
- .switchIfEmpty(Mono.error(new BaseException(StrUtil.format("通过计划营销分类:{};查询底部广告返回结果为空",plan.groupId()))))
|
|
|
- .onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage()+"4")))
|
|
|
- .collectList();////广告类型1顶部2底部3返回4安卓,ios的返回
|
|
|
+ .collectList().switchIfEmpty(Mono.just(List.of()));////广告类型1顶部2底部3返回4安卓,ios的返回
|
|
|
}else {
|
|
|
adBottom = template.select(Query.query(Criteria.where("type").is(2)
|
|
|
.and("deleted_at").isNull()).columns("id,name,type,image,show_beg_at,show_end_at,link".split(",")), Ad.class)
|