diff --git a/src/controllers/00-employment-office-controller.ts b/src/controllers/00-employment-office-controller.ts index 4aef059..519bd2d 100644 --- a/src/controllers/00-employment-office-controller.ts +++ b/src/controllers/00-employment-office-controller.ts @@ -11,23 +11,19 @@ export class EmploymentOfficeController extends Controller { return await prisma.employmentOffice.findMany({ where: { OR: - !!districtId || !!query + districtId || query ? [ - ...(districtId - ? [ - { - province: { - district: { some: { id: districtId } }, - }, - district: { none: {} }, - }, - { - district: { - some: { districtId }, - }, - }, - ] - : []), + ...(queryOrNot(!!districtId, [ + { + province: { district: { some: { id: districtId } } }, + district: { none: {} }, + }, + { + district: { + some: { districtId }, + }, + }, + ]) ?? []), ...(queryOrNot(query, [ { name: { contains: query } }, { nameEN: { contains: query } },