|
@@ -119,7 +119,7 @@ public class IllegallyTypeController extends ControllerSupport {
|
|
|
};
|
|
|
|
|
|
PageRequest pageRequest = PageRequest.of(curPage, pageSize,
|
|
|
- new Sort(Direction.DESC, "id"));
|
|
|
+ Sort.by(Direction.DESC, "id"));
|
|
|
|
|
|
|
|
|
Page<IllegallyTypeEntity> page = illegallyTypeRepo.findAll(specification, pageRequest);
|
|
@@ -197,11 +197,11 @@ public class IllegallyTypeController extends ControllerSupport {
|
|
|
}
|
|
|
|
|
|
List<Sort.Order> orderList = new ArrayList<>();
|
|
|
- orderList.add(new Sort.Order(Direction.DESC, "dataCategory"));
|
|
|
- orderList.add(new Sort.Order(Direction.ASC, "id"));
|
|
|
+ orderList.add(Sort.by.Order(Direction.DESC, "dataCategory"));
|
|
|
+ orderList.add(Sort.by.Order(Direction.ASC, "id"));
|
|
|
|
|
|
List<IllegallyTypeEntity> list = illegallyTypeRepo.findAll(specification,
|
|
|
- new Sort(orderList));
|
|
|
+ Sort.by(orderList));
|
|
|
|
|
|
|
|
|
if (StringUtils.isNotEmpty(queryScope) && queryScope.toLowerCase().equals("audit")) {
|