From 4e13c44fc8b2100eba06368cfac73c44ad39a468 Mon Sep 17 00:00:00 2001 From: wzp Date: Mon, 13 Jan 2025 15:17:12 +0800 Subject: [PATCH] fix: fix cannot get user from empty club --- src/main/java/org/blue/club/services/ClubServices.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/blue/club/services/ClubServices.java b/src/main/java/org/blue/club/services/ClubServices.java index 474c6cd..02430a7 100644 --- a/src/main/java/org/blue/club/services/ClubServices.java +++ b/src/main/java/org/blue/club/services/ClubServices.java @@ -87,8 +87,10 @@ public class ClubServices { if (clubDao.selectCountByCondition(CLUB_VO.ID.eq(clubId)) == 0) return Result.failed(HttpStatus.NOT_FOUND, "社团不存在！"); Page paginate = clubUserAuthDao.paginate(page, num, select(CLUB_USER_AUTH_VO.ALL_COLUMNS).where(CLUB_USER_AUTH_VO.CLUB_ID.eq(clubId)).orderBy(CLUB_USER_AUTH_VO.AUTH_ID.asc(), CLUB_USER_AUTH_VO.USER_ID.asc())); + long totalRow = paginate.getTotalRow(); + if (totalRow == 0) return Result.success(new PagerData<>(0, List.of())); List userVos = userDao.selectListWithRelationsByQuery(select(USER_VO.ALL_COLUMNS).from(USER_VO).where(USER_VO.ID.in(paginate.getRecords().stream().map(ClubUserAuthVo::getUserId).toList()))); - return Result.success(new PagerData<>(paginate.getTotalRow(), userVos.stream().map(e -> voUtils.vo2DtoSafe(e, User.class)).toList())); + return Result.success(new PagerData<>(totalRow, userVos.stream().map(e -> voUtils.vo2DtoSafe(e, User.class)).toList())); } public Result clubRemoveUser(User user, long clubId, long userId) {