Browse Source

plan-java v0.41

(cherry picked from commit 13713c09aeebfcd11734cea26e320754ec84b1b3)
MOKASZ\lw12420 2 năm trước cách đây
mục cha
commit
a0bb249969

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

@@ -264,7 +264,9 @@ public class PlanNewOutController {
             List<PlanNewBackgroupPoster> fx = collect.get(1).stream().sorted(Comparator.comparing(PlanNewBackgroupPoster::index)).collect(Collectors.toList());
             if (Objects.nonNull(fx) &&fx.size() != 0) {
                 if (fx.size() <= request.getUserVisits()) {
-                    dataLists0.setFxSetting(fx.getLast());
+                    Integer userVisits = request.getUserVisits();
+                    int v =userVisits%fx.size();
+                    dataLists0.setFxSetting(fx.get(v));
                     dataLists0.setLink(dataLists0.getPlanNew().link());
                 }else {
                     dataLists0.setLink(null);
@@ -274,7 +276,10 @@ public class PlanNewOutController {
             List<PlanNewBackgroupPoster> qs = collect.get(2).stream().sorted(Comparator.comparing(PlanNewBackgroupPoster::index)).collect(Collectors.toList());
             if(Objects.nonNull(qs) && !qs.isEmpty()){
                 if (qs.size() <= request.getUserVisits()) {
-                    dataLists0.setQsSetting(qs.getLast());
+                    Integer userVisits = request.getUserVisits();
+                    int v =userVisits%fx.size();
+                    dataLists0.setQsSetting(fx.get(v));
+                    //dataLists0.setQsSetting(qs.getLast());
                 }else {
                     dataLists0.setQsSetting(qs.get(request.getUserVisits()));
                 }