|
|
@@ -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()));
|
|
|
}
|