diff --git a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java index c149c4b..eaa8208 100644 --- a/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java +++ b/src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java @@ -33,18 +33,12 @@ public class NewsController { public ResponseEntity getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) { String username = JwtUtil.extractUsername(token); UserHS user = userService.getUserByUsername(username); - // TODO:完善用户权限 - if (user.getSuperAdmin()) { - - } else { - - } - if (start >= end) { return new ResponseEntity<>(HttpStatus.BAD_REQUEST); } - long newsCount = newsService.getNewsCount(); - return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsService.getNewsByRange(start, end, user)), HttpStatus.OK); + List newsList = newsService.getNewsByRange(start, end, user); + long newsCount = newsList.size(); + return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsList), HttpStatus.OK); } @PostMapping("/search")