|
|
@@ -867,7 +867,7 @@ public class PlanNewCommonOutController {
|
|
|
List<Long> longs = new ArrayList<>();
|
|
|
for (int i = 0; i < request.getAlbumNum(); i++) {
|
|
|
List<Long> collect = lists.stream().filter(f -> !longs.contains(f)).collect(Collectors.toList());
|
|
|
- Long aLong = collect.get(RandomUtil.randomInt(0, lists.size()));
|
|
|
+ Long aLong = collect.get(RandomUtil.randomInt(0, collect.size()));
|
|
|
longs.add(aLong);
|
|
|
}
|
|
|
Mono<List<AlbumReq>> listMono = Flux.fromIterable(longs).flatMap(id -> {
|
|
|
@@ -976,7 +976,9 @@ public class PlanNewCommonOutController {
|
|
|
}
|
|
|
if (Objects.nonNull(request.getRedirectType()) && request.getRedirectType() == 2 ) {
|
|
|
stringBuilderMono = goGenerateService.byPlanNewIdGetUrlCommon(request.getRedirectPlanId(), isQs, request.getGroupIdQs());
|
|
|
- } else {
|
|
|
+ } else if(7 == plan.type()){
|
|
|
+ stringBuilderMono = Mono.just(new StringBuilder(request.getLink() == null ? "空" : request.getLink()));
|
|
|
+ }else {
|
|
|
stringBuilderMono = Mono.just(new StringBuilder(request.getLink() == null ? "" : request.getLink()));
|
|
|
}
|
|
|
Mono<PlanNewCommon> code = Mono.just(plan);
|