Quellcode durchsuchen

听书裂变3.15

(cherry picked from commit 77f85b8a3c91ed2442d45a83114dc548d1551d5a)
(cherry picked from commit 311cb017806b9c144bb6b5522ecf238aaf764182)
MOKASZ\lw12420 vor 2 Jahren
Ursprung
Commit
6565860c8f

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

@@ -969,7 +969,8 @@ public class PlanNewController {
         }).collectList();
         Mono<Paged<ListeningPlanNewRes2>> pagedMono = Mono.zip(count, listMono).flatMap(ff -> {
             Long t1 = ff.getT1();
-            Paged<ListeningPlanNewRes2> planNewResPaged = new Paged<>(t1, ff.getT2(), request.getPage(), request.getSize());
+            List<ListeningPlanNewRes2> t2 = ff.getT2().stream().sorted(Comparator.comparing(ListeningPlanNewRes::getCreatedAt).reversed()).collect(Collectors.toList());
+            Paged<ListeningPlanNewRes2> planNewResPaged = new Paged<>(t1, t2, request.getPage(), request.getSize());
             return Mono.just(planNewResPaged);
         });
         return RStatus.successList(pagedMono);

+ 2 - 1
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/listening/ListeningPlanServiceImpl.java

@@ -100,7 +100,8 @@ public class ListeningPlanServiceImpl implements ListeningPlanServiceInterface{
             });
         }).collectList()).flatMap(ff -> {
             Long t1 = ff.getT1();
-            Paged<ListeningPlanNewRes2> planNewResPaged = new Paged<>(t1, ff.getT2(), request.getPage(), request.getSize());
+            List<ListeningPlanNewRes2> t2 = ff.getT2().stream().sorted(Comparator.comparing(ListeningPlanNewRes::getCreatedAt).reversed()).collect(Collectors.toList());
+            Paged<ListeningPlanNewRes2> planNewResPaged = new Paged<>(t1, t2, request.getPage(), request.getSize());
             return Mono.just(planNewResPaged);
         }));
     }