yoho-search / yoho-search-service · Commits

Go to a project

Authored by hugufei
Commit 35f3f2eef12ee570801eba6c3cc2367fc1c33b65 1 parent c14349e8

fix bug

Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
@@ -236,23 +236,23 @@ public class UserRecallResponseBuilder { @@ -236,23 +236,23 @@ public class UserRecallResponseBuilder {
236 List<RecallMergerResult.SknResult> commonCtrValueResultList = new ArrayList<>(); 236 List<RecallMergerResult.SknResult> commonCtrValueResultList = new ArrayList<>();
237 while (iterator.hasNext()) { 237 while (iterator.hasNext()) {
238 RecallMergerResult.SknResult sknResult = iterator.next(); 238 RecallMergerResult.SknResult sknResult = iterator.next();
239 - if (sknResult.equals(StrategyEnum.COMMON)) { 239 + if (sknResult.getStrategy().equals(StrategyEnum.COMMON)) {
240 commonResultList.add(sknResult); 240 commonResultList.add(sknResult);
241 iterator.remove(); 241 iterator.remove();
242 } 242 }
243 - if (sknResult.equals(StrategyEnum.COMMON_HEAT_VALUE)) { 243 + if (sknResult.getStrategy().equals(StrategyEnum.COMMON_HEAT_VALUE)) {
244 commonHeatValueResultList.add(sknResult); 244 commonHeatValueResultList.add(sknResult);
245 iterator.remove(); 245 iterator.remove();
246 } 246 }
247 - if (sknResult.equals(StrategyEnum.COMMON_CTR_VALUE)) { 247 + if (sknResult.getStrategy().equals(StrategyEnum.COMMON_CTR_VALUE)) {
248 commonCtrValueResultList.add(sknResult); 248 commonCtrValueResultList.add(sknResult);
249 iterator.remove(); 249 iterator.remove();
250 } 250 }
251 } 251 }
252 - commonHeatValueResultList = CollectionUtils.safeSubList(commonHeatValueResultList, 0, pageSize);  
253 commonCtrValueResultList = CollectionUtils.safeSubList(commonCtrValueResultList, 0, pageSize); 252 commonCtrValueResultList = CollectionUtils.safeSubList(commonCtrValueResultList, 0, pageSize);
254 - sknResultList.addAll(commonHeatValueResultList); 253 + commonHeatValueResultList = CollectionUtils.safeSubList(commonHeatValueResultList, 0, pageSize);
255 sknResultList.addAll(commonCtrValueResultList); 254 sknResultList.addAll(commonCtrValueResultList);
  255 + sknResultList.addAll(commonHeatValueResultList);
256 //3.1:如果是数量少于一页，则加会兜底的数据 256 //3.1:如果是数量少于一页，则加会兜底的数据
257 if (sknResultList.size() < pageSize) { 257 if (sknResultList.size() < pageSize) {
258 sknResultList.addAll(commonResultList); 258 sknResultList.addAll(commonResultList);