diff --git a/src/controllers/00-employment-office-controller.ts b/src/controllers/00-employment-office-controller.ts index 519bd2d..ed7a0c8 100644 --- a/src/controllers/00-employment-office-controller.ts +++ b/src/controllers/00-employment-office-controller.ts @@ -13,21 +13,26 @@ export class EmploymentOfficeController extends Controller { OR: districtId || query ? [ - ...(queryOrNot(!!districtId, [ - { - province: { district: { some: { id: districtId } } }, - district: { none: {} }, - }, - { - district: { - some: { districtId }, + ...queryOrNot( + !!districtId, + [ + { + province: { district: { some: { id: districtId } } }, + district: { none: {} }, }, - }, - ]) ?? []), - ...(queryOrNot(query, [ - { name: { contains: query } }, - { nameEN: { contains: query } }, - ]) ?? []), + { + district: { + some: { districtId }, + }, + }, + ], + [], + ), + ...queryOrNot( + query, + [{ name: { contains: query } }, { nameEN: { contains: query } }], + [], + ), ] : undefined, },