Authored by hugufei

fix bug

... ... @@ -236,23 +236,23 @@ public class UserRecallResponseBuilder {
List<RecallMergerResult.SknResult> commonCtrValueResultList = new ArrayList<>();
while (iterator.hasNext()) {
RecallMergerResult.SknResult sknResult = iterator.next();
if (sknResult.equals(StrategyEnum.COMMON)) {
if (sknResult.getStrategy().equals(StrategyEnum.COMMON)) {
commonResultList.add(sknResult);
iterator.remove();
}
if (sknResult.equals(StrategyEnum.COMMON_HEAT_VALUE)) {
if (sknResult.getStrategy().equals(StrategyEnum.COMMON_HEAT_VALUE)) {
commonHeatValueResultList.add(sknResult);
iterator.remove();
}
if (sknResult.equals(StrategyEnum.COMMON_CTR_VALUE)) {
if (sknResult.getStrategy().equals(StrategyEnum.COMMON_CTR_VALUE)) {
commonCtrValueResultList.add(sknResult);
iterator.remove();
}
}
commonHeatValueResultList = CollectionUtils.safeSubList(commonHeatValueResultList, 0, pageSize);
commonCtrValueResultList = CollectionUtils.safeSubList(commonCtrValueResultList, 0, pageSize);
sknResultList.addAll(commonHeatValueResultList);
commonHeatValueResultList = CollectionUtils.safeSubList(commonHeatValueResultList, 0, pageSize);
sknResultList.addAll(commonCtrValueResultList);
sknResultList.addAll(commonHeatValueResultList);
//3.1:如果是数量少于一页,则加会兜底的数据
if (sknResultList.size() < pageSize) {
sknResultList.addAll(commonResultList);
... ...