diff --git a/src/controllers/04-flow-template-controller.ts b/src/controllers/04-flow-template-controller.ts index d7bf3fe..29260f5 100644 --- a/src/controllers/04-flow-template-controller.ts +++ b/src/controllers/04-flow-template-controller.ts @@ -24,6 +24,7 @@ import HttpError from "../interfaces/http-error"; import HttpStatus from "../interfaces/http-status"; import { notFoundError } from "../utils/error"; import { filterStatus } from "../services/prisma"; +import { queryOrNot } from "../utils/relation"; type WorkflowPayload = { name: string; @@ -54,17 +55,19 @@ export class FlowTemplateController extends Controller { @Query() query = "", ) { const where = { - OR: [ + OR: queryOrNot(query, [ { name: { contains: query } }, { step: { some: { name: { contains: query } }, }, }, - ], - ...filterStatus(status), - registeredBranch: { - OR: permissionCondCompany(req.user), + ]), + AND: { + ...filterStatus(status), + registeredBranch: { + OR: permissionCondCompany(req.user), + }, }, } satisfies Prisma.WorkflowTemplateWhereInput; const [result, total] = await prisma.$transaction([