diff --git a/src/controllers/user_to_room.ts b/src/controllers/user_to_room.ts index 696e3a2..a8f2b75 100644 --- a/src/controllers/user_to_room.ts +++ b/src/controllers/user_to_room.ts @@ -483,16 +483,15 @@ export class UserToRoomController { const offset = (param.page - 1) * param.limit; const limit = param.limit; - const res_count = query - .innerJoin(UserToRoom, "user_to_room", "user_to_room.room = Room.id") + query.innerJoin(UserToRoom, "user_to_room", "user_to_room.room = Room.id") .andWhere("user_to_room.user = :userId", { userId: paramPath.user_id }); + + const res_count = query; const res_list = query - .innerJoin(UserToRoom, "user_to_room", "user_to_room.room = Room.id") - .andWhere("user_to_room.user = :userId", { userId: paramPath.user_id }) .leftJoinAndSelect("Room.department", "department") .orderBy("Room." + param.order_field, param.order_direction as "ASC" | "DESC") - .offset(offset) - .limit(limit); + .take(limit) + .skip(offset); if (param.with_deleted) { res_count.withDeleted();