diff --git a/src/controllers/service.ts b/src/controllers/service.ts index 8c2c290..22ebd57 100644 --- a/src/controllers/service.ts +++ b/src/controllers/service.ts @@ -55,7 +55,6 @@ export class ServiceController { const res_count = query; const res_list = query - .leftJoinAndSelect("Service.serviceType", "serviceType") .orderBy("Service." + param.order_field, param.order_direction) .offset(offset) .limit(limit); diff --git a/src/model/service.ts b/src/model/service.ts index c2becfd..6f6c09a 100644 --- a/src/model/service.ts +++ b/src/model/service.ts @@ -27,7 +27,10 @@ export class ServiceModel { } } - var query = repo.createQueryBuilder("Service"); + var query = repo + .createQueryBuilder("Service") + .leftJoinAndSelect("Service.serviceType", "serviceType") + if (whereAttr.length != 0) { query = query.where(whereAttr.join(" and "), whereVal); }