diff --git a/src/controllers/09-line-controller.ts b/src/controllers/09-line-controller.ts index 942120c..7704c4d 100644 --- a/src/controllers/09-line-controller.ts +++ b/src/controllers/09-line-controller.ts @@ -604,36 +604,39 @@ export class LineController extends Controller { @Query() query = "", ) { const where = { - OR: [ - ...(queryOrNot(query, [ - { code: { contains: query, mode: "insensitive" } }, - { workName: { contains: query } }, - { - customerBranch: { - OR: [ + OR: + query || pendingOnly + ? [ + ...(queryOrNot(query, [ { code: { contains: query, mode: "insensitive" } }, - { customerName: { contains: query } }, - { firstName: { contains: query } }, - { firstNameEN: { contains: query } }, - { lastName: { contains: query } }, - { lastNameEN: { contains: query } }, - ], - }, - }, - ]) || []), - ...(queryOrNot(!!pendingOnly, [ - { - requestData: { - some: { - requestDataStatus: "Pending", - }, - }, - }, - { - requestData: { none: {} }, - }, - ]) || []), - ], + { workName: { contains: query } }, + { + customerBranch: { + OR: [ + { code: { contains: query, mode: "insensitive" } }, + { customerName: { contains: query } }, + { firstName: { contains: query } }, + { firstNameEN: { contains: query } }, + { lastName: { contains: query } }, + { lastNameEN: { contains: query } }, + ], + }, + }, + ]) || []), + ...(queryOrNot(!!pendingOnly, [ + { + requestData: { + some: { + requestDataStatus: "Pending", + }, + }, + }, + { + requestData: { none: {} }, + }, + ]) || []), + ] + : undefined, isDebitNote: false, code, payCondition, @@ -657,8 +660,6 @@ export class LineController extends Controller { : undefined, } satisfies Prisma.QuotationWhereInput; - console.log(); - const [result, total] = await prisma.$transaction([ prisma.quotation.findMany({ where,