From 304ad0e9f7a32c809450402b1d78a0f6f89fc732 Mon Sep 17 00:00:00 2001 From: johnniang Date: Mon, 9 Dec 2019 18:04:52 +0800 Subject: [PATCH] Fix null error while unset page or size --- .../run/halo/app/controller/admin/api/PostController.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/main/java/run/halo/app/controller/admin/api/PostController.java b/src/main/java/run/halo/app/controller/admin/api/PostController.java index bc28831fd..d261cb7dc 100644 --- a/src/main/java/run/halo/app/controller/admin/api/PostController.java +++ b/src/main/java/run/halo/app/controller/admin/api/PostController.java @@ -55,13 +55,8 @@ public class PostController { @GetMapping @ApiOperation("Lists posts") - public Page pageBy(Integer page, Integer size, - @SortDefault.SortDefaults({ - @SortDefault(sort = "topPriority", direction = DESC), - @SortDefault(sort = "createTime", direction = DESC) - }) Sort sort, + public Page pageBy(@PageableDefault(sort = {"topPriority", "createTime"}, direction = DESC) Pageable pageable, PostQuery postQuery) { - Pageable pageable = PageRequest.of(page, size, sort); Page postPage = postService.pageBy(postQuery, pageable); return postService.convertToListVo(postPage); }