|
|
@@ -268,8 +268,9 @@ public class ReformServiceImpl implements ReformService {
|
|
|
.map(Optional::get)
|
|
|
.collect(Collectors.toList());
|
|
|
//重新排序,数据量超过一万可能耗时长一点,超过十万或许有性能问题
|
|
|
- sortData(order.trim(),mergedList);
|
|
|
- Map<String, Object> map = paginate(mergedList, pageNo , limit);
|
|
|
+ //sortData(order.trim(),mergedList);
|
|
|
+ List<Map<String, Object>> collect = sortByOrder(mergedList, order);
|
|
|
+ Map<String, Object> map = paginate(collect, pageNo , limit);
|
|
|
result.setVariables(map);
|
|
|
return result;
|
|
|
}
|