From f809f697f1448a0872dae3c0a1d4d9047b4fc42b Mon Sep 17 00:00:00 2001 From: wayanrivan Date: Mon, 30 Mar 2026 14:34:28 +0700 Subject: [PATCH] update: service join to service fare --- src/controllers/service_fare.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/controllers/service_fare.ts b/src/controllers/service_fare.ts index d6b8aa2..850ac26 100644 --- a/src/controllers/service_fare.ts +++ b/src/controllers/service_fare.ts @@ -43,17 +43,17 @@ export class ServiceFareController { let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {}; - var query = await ServiceFareModel.list(filter); + var query = await ServiceModel.list(filter); const offset = (param.page - 1) * param.limit; let limit = param.limit; const res_count = query; const res_list = query - .leftJoinAndSelect("ServiceFare.serviceClass", "serviceClass") - .leftJoinAndSelect("ServiceFare.service", "service") - .leftJoinAndSelect('ServiceFare.faretype', 'faretype') - .orderBy("ServiceFare." + param.order_field, param.order_direction) + .leftJoinAndSelect("Service.servicefare", "servicefare") + .leftJoinAndSelect("servicefare.serviceClass", "serviceClass") + // .leftJoinAndSelect('ServiceFare.faretype', 'faretype') + .orderBy("Service." + param.order_field, param.order_direction) .offset(offset) .limit(limit);