forked from RyanGoodwill/backend
修复了totalnum显示错误的问题
This commit is contained in:
parent
5b83c56f58
commit
2049f5f87d
@ -33,18 +33,12 @@ public class NewsController {
|
|||||||
public ResponseEntity<GetNewsListResponse> getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
|
public ResponseEntity<GetNewsListResponse> getNewsByRange(@RequestParam Integer start, @RequestParam Integer end, @RequestParam String token) {
|
||||||
String username = JwtUtil.extractUsername(token);
|
String username = JwtUtil.extractUsername(token);
|
||||||
UserHS user = userService.getUserByUsername(username);
|
UserHS user = userService.getUserByUsername(username);
|
||||||
// TODO:完善用户权限
|
|
||||||
if (user.getSuperAdmin()) {
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (start >= end) {
|
if (start >= end) {
|
||||||
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
|
||||||
}
|
}
|
||||||
long newsCount = newsService.getNewsCount();
|
List<News> newsList = newsService.getNewsByRange(start, end, user);
|
||||||
return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsService.getNewsByRange(start, end, user)), HttpStatus.OK);
|
long newsCount = newsList.size();
|
||||||
|
return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsList), HttpStatus.OK);
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping("/search")
|
@PostMapping("/search")
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user