fix(usertoroom): duplicate query join on list room
This commit is contained in:
@ -483,16 +483,15 @@ export class UserToRoomController {
|
|||||||
const offset = (param.page - 1) * param.limit;
|
const offset = (param.page - 1) * param.limit;
|
||||||
const limit = param.limit;
|
const limit = param.limit;
|
||||||
|
|
||||||
const res_count = query
|
query.innerJoin(UserToRoom, "user_to_room", "user_to_room.room = Room.id")
|
||||||
.innerJoin(UserToRoom, "user_to_room", "user_to_room.room = Room.id")
|
|
||||||
.andWhere("user_to_room.user = :userId", { userId: paramPath.user_id });
|
.andWhere("user_to_room.user = :userId", { userId: paramPath.user_id });
|
||||||
|
|
||||||
|
const res_count = query;
|
||||||
const res_list = 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")
|
.leftJoinAndSelect("Room.department", "department")
|
||||||
.orderBy("Room." + param.order_field, param.order_direction as "ASC" | "DESC")
|
.orderBy("Room." + param.order_field, param.order_direction as "ASC" | "DESC")
|
||||||
.offset(offset)
|
.take(limit)
|
||||||
.limit(limit);
|
.skip(offset);
|
||||||
|
|
||||||
if (param.with_deleted) {
|
if (param.with_deleted) {
|
||||||
res_count.withDeleted();
|
res_count.withDeleted();
|
||||||
|
|||||||
Reference in New Issue
Block a user