Compare commits

...

2 Commits

Author SHA1 Message Date
2049f5f87d 修复了totalnum显示错误的问题 2024-07-06 15:07:25 +08:00
5b83c56f58 修复修改和删除 2024-07-06 14:53:04 +08:00
4 changed files with 6 additions and 12 deletions

View File

@ -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")

View File

@ -107,7 +107,7 @@ public class UserManagementController {
@PostMapping("/delete") @PostMapping("/delete")
@Transactional @Transactional
public void delete(@RequestBody User user) { public void delete(@RequestBody User user) {
UserHS userHS = userService.getUserByUsername(user.getName()); UserHS userHS = userService.getUserByUsername(user.getAccount());
if (userHS != null) { if (userHS != null) {
//根据用户名删除用户 //根据用户名删除用户
userService.deleteUser(userHS.getUsername()); userService.deleteUser(userHS.getUsername());

View File

@ -8,7 +8,7 @@ import java.util.List;
public interface UserRepository extends JpaRepository<UserHS, Long> { public interface UserRepository extends JpaRepository<UserHS, Long> {
UserHS findByUsername(String username); UserHS findByUsername(String username);
boolean deleteByUsername(String username); Integer deleteByUsername(String username);
List<UserHS> findByTenant(String tenant); List<UserHS> findByTenant(String tenant);
} }

View File

@ -94,7 +94,7 @@ public class UserService {
return true; return true;
} }
public boolean deleteUser(String username){ public Integer deleteUser(String username){
return userRepository.deleteByUsername(username); return userRepository.deleteByUsername(username);
} }