diff --git a/src/controllers/room_services.ts b/src/controllers/room_services.ts index 3c6fb26..40a1885 100644 --- a/src/controllers/room_services.ts +++ b/src/controllers/room_services.ts @@ -180,12 +180,12 @@ export class RoomServicesController { .leftJoin("Service.serviceType", "serviceType") .leftJoin("Service.rooms", "room") .leftJoin("room.serviceclass", "roomClass") - // .innerJoin("Service.servicefare", "serviceFare") - // .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") - // .innerJoin("serviceFare.faretype", "fareType") - .leftJoin("Service.servicefare", "serviceFare") - .leftJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") - .leftJoin("serviceFare.faretype", "fareType") + .innerJoin("Service.servicefare", "serviceFare") + .innerJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") + .innerJoin("serviceFare.faretype", "fareType") + // .leftJoin("Service.servicefare", "serviceFare") + // .leftJoin("serviceFare.serviceClass", "serviceClass", "serviceClass.id = roomClass.id") + // .leftJoin("serviceFare.faretype", "fareType") .where("room.id = :roomId", { roomId }) .orderBy("Service." + param.order_field, param.order_direction) .skip(offset)