|
|
@@ -347,14 +347,15 @@ public class PlanNewOutController {
|
|
|
.onErrorResume(throwable -> Mono.error(new BaseException(throwable.getMessage())));
|
|
|
Mono<DataLists> dataListsMono1 = Mono.zip(code0,stringMono).flatMap(tuple2 -> {
|
|
|
String t21 = tuple2.getT2();
|
|
|
+ PlanNew planNew = tuple2.getT1();
|
|
|
if( !t21.isBlank()){
|
|
|
JSONArray jsonArray = JSONUtil.parseArray(t21);
|
|
|
List<H5ImageAndText> collect = jsonArray.stream().map(str -> JSONUtil.toBean(JSONUtil.parseObj(str), H5ImageAndText.class)).collect(Collectors.toList());
|
|
|
DataLists dataLists = new DataLists();
|
|
|
dataLists.setImages(collect);
|
|
|
+ dataLists.setPlanNew(planNew);
|
|
|
return Mono.just(dataLists);
|
|
|
}
|
|
|
- PlanNew planNew = tuple2.getT1();
|
|
|
Mono<PlanNew> code = Mono.just(planNew);
|
|
|
Long group_type_id ; //.and("group_type_id").is(group_type_id)
|
|
|
if (Objects.isNull(request.getWx_user_id()) || "".equals(request.getWx_user_id())) {
|