src/main/java/org/cmh/backend/NewsManagement/controller/NewsController.java

@@ -33,12 +33,18 @@ public class NewsController {
     public ResponseEntity<GetNewsListResponse> 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);
         }
-        List<News> newsList = newsService.getNewsByRange(start, end, user);
+        long newsCount = newsService.getNewsCount();
-        long newsCount = newsList.size();
+        return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsService.getNewsByRange(start, end, user)), HttpStatus.OK);
-        return new ResponseEntity<>(new GetNewsListResponse(newsCount, newsList), HttpStatus.OK);
     }
 
     @PostMapping("/search")

src/main/java/org/cmh/backend/UserManagement/controller/UserManagementController.java

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

src/main/java/org/cmh/backend/authentication/repository/UserRepository.java

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

src/main/java/org/cmh/backend/authentication/service/UserService.java

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