From 8029bf26f36447e89d1a6a6bc7a7cccafe749288 Mon Sep 17 00:00:00 2001
From: wzp <minecraftwzpmc@163.com>
Date: Mon, 13 Jan 2025 15:36:40 +0800
Subject: [PATCH] feat: add only no club user query

---
 .../java/org/blue/club/controller/UserController.java  |  4 ++--
 src/main/java/org/blue/club/services/UserServices.java | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/blue/club/controller/UserController.java b/src/main/java/org/blue/club/controller/UserController.java
index 786abdb..f3d484a 100644
--- a/src/main/java/org/blue/club/controller/UserController.java
+++ b/src/main/java/org/blue/club/controller/UserController.java
@@ -48,8 +48,8 @@ public class UserController {
     @GetMapping("/all")
     @Operation(description = "获取所有用户信息（分页）")
     @Auth(permissions = {@PermissionDescription(3), @PermissionDescription(4)})
-    public Result<PagerData<User>> getAllUserInfo(@RequestParam("num") int num, @RequestParam("page") int page) {
-        return userServices.getAllUserInfo(num, page);
+    public Result<PagerData<User>> getAllUserInfo(@RequestParam("num") int num, @RequestParam("page") int page, @RequestParam(value = "onlyNoClub", defaultValue = "false") boolean onlyNoClub) {
+        return userServices.getAllUserInfo(num, page, onlyNoClub);
     }
 
     @PutMapping("/rename")
diff --git a/src/main/java/org/blue/club/services/UserServices.java b/src/main/java/org/blue/club/services/UserServices.java
index 4fc4aca..3f0650d 100644
--- a/src/main/java/org/blue/club/services/UserServices.java
+++ b/src/main/java/org/blue/club/services/UserServices.java
@@ -1,6 +1,7 @@
 package org.blue.club.services;
 
 import com.mybatisflex.core.paginate.Page;
+import com.mybatisflex.core.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.blue.club.dao.UserDao;
@@ -25,6 +26,7 @@ import java.util.List;
 import java.util.Optional;
 
 import static com.mybatisflex.core.query.QueryMethods.select;
+import static org.blue.club.entities.vo.data.table.ClubUserAuthVoTableDef.CLUB_USER_AUTH_VO;
 import static org.blue.club.entities.vo.data.table.UserVoTableDef.USER_VO;
 
 @Slf4j
@@ -77,8 +79,12 @@ public class UserServices {
         return Result.success(voUtils.vo2DtoSafe(insertedUserData, User.class));
     }
 
-    public Result<PagerData<User>> getAllUserInfo(int num, int page) {
-        Page<UserVo> userVoPage = userDao.paginateWithRelations(page, num, select(USER_VO.ALL_COLUMNS).from(USER_VO));
+    public Result<PagerData<User>> getAllUserInfo(int num, int page, boolean onlyNoClub) {
+        QueryWrapper from = select(USER_VO.ALL_COLUMNS).from(USER_VO);
+        if (onlyNoClub) {
+            from.leftJoin(CLUB_USER_AUTH_VO).on(CLUB_USER_AUTH_VO.USER_ID.eq(USER_VO.ID)).where(CLUB_USER_AUTH_VO.CLUB_ID.isNull());
+        }
+        Page<UserVo> userVoPage = userDao.paginateWithRelations(page, num, from);
         long totalRow = userVoPage.getTotalRow();
         List<UserVo> records = userVoPage.getRecords();
         return Result.success(new PagerData<>(totalRow, records.stream().map(e -> voUtils.vo2DtoSafe(e, User.class)).toList()));