noticeList type存在时候只展示一个演出

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -145,6 +145,10 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
 
         toDayList = checkAppStatus(toDayList);
         threeDaysList = checkAppStatus(threeDaysList);
+        if (null != type && type > 0) {
+            toDayList = mergeRoadList(toDayList);
+            threeDaysList = mergeRoadList(threeDaysList);
+        }
 
         HashMap<String, Object> newList = CollectionUtil.mapStringObject();
         newList.put("toDayList", toDayList);
@@ -152,6 +156,21 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         return newList;
     }
 
+    private List<KylinPerformanceVo> mergeRoadList(List<KylinPerformanceVo> PerformanceList) {
+        List<String> roadIdList = Arrays.asList();
+        List<KylinPerformanceVo> newList = ObjectUtil.getKylinPerformanceVoArrayList();
+        for (KylinPerformanceVo info : PerformanceList) {
+            String roadShowId = info.getRoadShowId();
+            if (null != roadShowId && !roadShowId.isEmpty()) {
+                if (!roadIdList.contains(info.getRoadShowId())) {
+                    newList.add(info);
+                    roadIdList.add(roadShowId);
+                }
+            }
+        }
+        return newList;
+    }
+
     public List<KylinPerformanceVo> recommendList() {
         List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsRecommend();
         performancesListRecommend = checkAppStatus(performancesListRecommend);