plan-java v0.53

launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewController.java

@@ -228,7 +228,7 @@ public class PlanNewController {
                 template.select(Query.query(finalCriteria)
                         .offset(skip)
                         .limit(limit)
-                        .sort(Sort.by(Sort.Order.desc("created_at"))),Poster.class)
+                        .sort(Sort.by(Sort.Order.asc("created_at"))),Poster.class)
                         .collectList()
                         .map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
         );

launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -243,12 +243,14 @@ public class GoGenerateService {
 
         Mono<String> stringMono = Mono.zip(bgImage, fmImage, text, stringBuilderMono,fm1,getStringBuilderMono(saveRequest)).flatMap(f -> {
             List<StringBuilder> t4 = f.getT4();
-
-            Optional<Image> first = f.getT1().stream().findFirst();
-            //first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
-            if (goRequest.getIsRandom()) {
-                first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+            if (Objects.nonNull(f.getT4()) && !f.getT4().isEmpty()) {
+                Optional<Image> first = f.getT1().stream().findFirst();
+                //first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+                if (goRequest.getIsRandom()) {
+                    first.ifPresent(image -> goRequest.setBg_img_src(image.image()));
+                }
             }
+
             //封面
             if( Objects.nonNull(f.getT5()) &&!f.getT5().isEmpty()) {
                 goRequest.getItem().stream().filter(ff -> "cover".equals(ff.getT()) && ff.getIsRandom()).findFirst()
@@ -270,7 +272,7 @@ public class GoGenerateService {
                             item.setName("客服二维码");
                         }
                     }
-                }else if(Objects.nonNull(qsSetting.getStatus()) &&  qsSetting.getStatus()==0) {
+                }else if(Objects.nonNull(qsSetting.getStatus()) &&  qsSetting.getStatus()==0 ) {
                     StringBuilder t6 = f.getT6();
                     item.setV(t6.toString());
                     item.setName("H5二维码");
@@ -457,8 +459,6 @@ public class GoGenerateService {
                                         .filter(ft -> ft.getPlanId()
                                                 .equals(f.planNewId()) && (Objects.isNull(ft.getV()) || "".equals(ft.getV()))).findFirst();
                         first.ifPresent(item -> item.setV(stringBuilder.toString()));
-
-                               // System.out.println(stringBuilder);
                                 return stringBuilder;
                             })
                     ).collectList();