feat: 分离不同状态的数据

src/main/java/cn/celess/blog/controller/UserController.java

@@ -116,8 +116,8 @@ public class UserController {
     }
 
     @GetMapping("/admin/users")
-    public Response getAllUser(@RequestParam("page") int pageNum, @RequestParam("count") int count) {
-        return Response.success(userService.getUserList(pageNum, count));
+    public Response getAllUser(@RequestParam("page") int pageNum, @RequestParam("count") int count, @RequestParam(name = "status", required = false) Integer status) {
+        return Response.success(userService.getUserList(pageNum, count, status));
     }
 
     @GetMapping("/emailStatus/{email}")

src/main/java/cn/celess/blog/mapper/UserMapper.java

@@ -53,6 +53,8 @@ public interface UserMapper {
 
     int setUserRole(Long id, String role);
 
+    List<User> findAll(Integer status);
+
     List<User> findAll();
 
     int update(User user);

src/main/java/cn/celess/blog/service/UserService.java

@@ -129,7 +129,7 @@ public interface UserService {
      * @param page  数据页
      * @return 分页数据
      */
-    PageData<UserModel> getUserList(Integer page, Integer count);
+    PageData<UserModel> getUserList(Integer page, Integer count, Integer status);
 
     /**
      * 更改用户信息

src/main/java/cn/celess/blog/service/serviceimpl/UserServiceImpl.java

@@ -28,6 +28,7 @@ import java.beans.Transient;
 import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author : xiaohai
@@ -338,12 +339,11 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public PageData<UserModel> getUserList(Integer page, Integer count) {
+    public PageData<UserModel> getUserList(Integer page, Integer count, Integer status) {
         PageHelper.startPage(page, count);
-        List<User> all = userMapper.findAll();
-        List<UserModel> modelList = new ArrayList<>();
-        all.forEach(user -> modelList.add(ModalTrans.userFullInfo(user)));
-        return new PageData<UserModel>(PageInfo.of(all), modelList);
+        List<User> all = userMapper.findAll(status);
+        List<UserModel> modelList = all.stream().map(ModalTrans::userFullInfo).collect(Collectors.toList());
+        return new PageData<>(PageInfo.of(all), modelList);
     }
 
     @Override