plan-java v0.15

(cherry picked from commit 08e809a1655b9a91bf7c1b06e2000bf1b01e0d6d)

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

@@ -147,32 +147,42 @@ public class PlanNewOutController {
             dataLists0.setPlanNew(f.getT1());
             dataLists0.setPosterTemplate(f.getT2());
             List<Poster> t3 = f.getT3();
-            if (t3.size() <= request.getUserVisits()) {
-                dataLists0.setPoster(t3.getLast());
-            }else {
-                dataLists0.setPoster(t3.get(request.getUserVisits()));
+            if(t3.size()!=0){
+                if (t3.size() <= request.getUserVisits()) {
+                    dataLists0.setPoster(t3.getLast());
+                }else {
+                    dataLists0.setPoster(t3.get(request.getUserVisits()));
+                }
             }
             Map<Integer, List<PlanNewBackgroupPoster>> collect = f.getT4().stream().collect(Collectors.groupingBy(PlanNewBackgroupPoster::qsOrFx));
             List<PlanNewBackgroupPoster> fx = collect.get(1);
-            if (fx.size() <= request.getUserVisits()) {
-                dataLists0.setFxSetting(fx.getLast());
-            }else {
-                dataLists0.setFxSetting(fx.get(request.getUserVisits()));
+            if (fx.size() != 0) {
+                if (fx.size() <= request.getUserVisits()) {
+                    dataLists0.setFxSetting(fx.getLast());
+                }else {
+                    dataLists0.setFxSetting(fx.get(request.getUserVisits()));
+                }
             }
             List<PlanNewBackgroupPoster> qs = collect.get(2);
-            if (qs.size() <= request.getUserVisits()) {
-                dataLists0.setQsSetting(qs.getLast());
-            }else {
-                dataLists0.setQsSetting(qs.get(request.getUserVisits()));
+            if(!qs.isEmpty()){
+                if (qs.size() <= request.getUserVisits()) {
+                    dataLists0.setQsSetting(qs.getLast());
+                }else {
+                    dataLists0.setQsSetting(qs.get(request.getUserVisits()));
+                }
             }
             if (Objects.nonNull(request.getWx_user_id()) && !"".equals(request.getWx_user_id())) {
                 PlanNewBackgroupPoster qsSetting = dataLists0.getQsSetting();
-                dataLists0.setLimitTime(qsSetting.limitTime());
-                dataLists0.setLimitTimeRemark(qsSetting.limitTimeRemark());
+                if(Objects.nonNull(qsSetting)){
+                    dataLists0.setLimitTime(qsSetting.limitTime());
+                    dataLists0.setLimitTimeRemark(qsSetting.limitTimeRemark());
+                }
             }else {
                 PlanNewBackgroupPoster fxSetting = dataLists0.getFxSetting();
-                dataLists0.setLimitTime(fxSetting.limitTime());
-                dataLists0.setLimitTimeRemark(fxSetting.limitTimeRemark());
+                if(Objects.nonNull(fxSetting)){
+                    dataLists0.setLimitTime(fxSetting.limitTime());
+                    dataLists0.setLimitTimeRemark(fxSetting.limitTimeRemark());
+                }
             }
             dataLists0.setLink(dataLists0.getPlanNew().link());
             return Mono.just(dataLists0);