From 7db7cc895d6cf7b145ae4d3e3910bb8d639347e9 Mon Sep 17 00:00:00 2001 From: wzp Date: Wed, 25 Dec 2024 17:09:23 +0800 Subject: [PATCH] fix: fix order for get user in club controller --- src/main/java/org/blue/club/services/ClubServices.java | 2 +- 1 file changed, 1 insertion(+), 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 3627cdd..f99cfc3 100644 --- a/src/main/java/org/blue/club/services/ClubServices.java +++ b/src/main/java/org/blue/club/services/ClubServices.java @@ -74,7 +74,7 @@ public class ClubServices { public Result> clubGetUsers(Integer page, Integer num, Long clubId) { 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.desc(), CLUB_USER_AUTH_VO.USER_ID.desc())); + 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())); 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())); }