|  | @@ -292,14 +292,14 @@ public class RankService {
 | 
											
												
													
														|  |          if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
 |  |          if (CollectionUtils.isNotEmpty(quickFlowPoolVideos)) {
 | 
											
												
													
														|  |              return quickFlowPoolVideos;
 |  |              return quickFlowPoolVideos;
 | 
											
												
													
														|  |          } else {
 |  |          } else {
 | 
											
												
													
														|  | -//            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
 |  | 
 | 
											
												
													
														|  | 
 |  | +            return extractAndSort(param, FlowPoolConstants.PUSH_FORM);
 | 
											
												
													
														|  |              //供给流量池 新增pushForm;由于供给流量池占比小,先判断 正常流量池
 |  |              //供给流量池 新增pushForm;由于供给流量池占比小,先判断 正常流量池
 | 
											
												
													
														|  | -            List<Video> flowPoolVideos = extractAndSort(param, FlowPoolConstants.PUSH_FORM);
 |  | 
 | 
											
												
													
														|  | -            if (CollectionUtils.isNotEmpty(flowPoolVideos)) {
 |  | 
 | 
											
												
													
														|  | -                return flowPoolVideos;
 |  | 
 | 
											
												
													
														|  | -            } else {
 |  | 
 | 
											
												
													
														|  | -                return extractAndSort(param, FlowPoolConstants.SUPPLY_PUSH_FORM);
 |  | 
 | 
											
												
													
														|  | -            }
 |  | 
 | 
											
												
													
														|  | 
 |  | +//            List<Video> flowPoolVideos = extractAndSort(param, FlowPoolConstants.PUSH_FORM);
 | 
											
												
													
														|  | 
 |  | +//            if (CollectionUtils.isNotEmpty(flowPoolVideos)) {
 | 
											
												
													
														|  | 
 |  | +//                return flowPoolVideos;
 | 
											
												
													
														|  | 
 |  | +//            } else {
 | 
											
												
													
														|  | 
 |  | +//                return extractAndSort(param, FlowPoolConstants.SUPPLY_PUSH_FORM);
 | 
											
												
													
														|  | 
 |  | +//            }
 | 
											
												
													
														|  |          }
 |  |          }
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 |