chamomind/jws-backend
chamomind/jws-backend
6
0
Fork 0
Code Issues Projects 1 Releases Packages 1 Wiki Activity Actions

fix: condition

Browse source
This commit is contained in:
Methapon2001 2024-07-04 11:27:19 +07:00
parent f0414b7487
commit ebdd5924a6
2 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/product/product-controller.ts
View file

@ -104,7 +104,7 @@ export class ProductController extends Controller {
@Query() query: string = "", @Query() query: string = "",
@Query() page: number = 1, @Query() page: number = 1,
@Query() pageSize: number = 30, @Query() pageSize: number = 30,
@Query() branchId?: string, @Query() registeredBranchId?: string,
) { ) {
const filterStatus = (val?: Status) => { const filterStatus = (val?: Status) => {
if (!val) return {}; if (!val) return {};
@ -119,9 +119,11 @@ export class ProductController extends Controller {
{ name: { contains: query }, productTypeId, ...filterStatus(status) }, { name: { contains: query }, productTypeId, ...filterStatus(status) },
{ detail: { contains: query }, productTypeId, ...filterStatus(status) }, { detail: { contains: query }, productTypeId, ...filterStatus(status) },
], ],
AND: { AND: registeredBranchId
OR: [{ registeredBranchId: branchId }, { registeredBranchId: null }], ? {
}, OR: [{ registeredBranchId: registeredBranchId }, { registeredBranchId: null }],
}
: undefined,
} satisfies Prisma.ProductWhereInput; } satisfies Prisma.ProductWhereInput;
const [result, total] = await prisma.$transaction([ const [result, total] = await prisma.$transaction([

10
src/controllers/service/service-controller.ts
View file

@ -93,7 +93,7 @@ export class ServiceController extends Controller {
@Query() pageSize: number = 30, @Query() pageSize: number = 30,
@Query() status?: Status, @Query() status?: Status,
@Query() productTypeId?: string, @Query() productTypeId?: string,
@Query() branchId?: string, @Query() registeredBranchId?: string,
) { ) {
const filterStatus = (val?: Status) => { const filterStatus = (val?: Status) => {
if (!val) return {}; if (!val) return {};
@ -108,9 +108,11 @@ export class ServiceController extends Controller {
{ name: { contains: query }, productTypeId, ...filterStatus(status) }, { name: { contains: query }, productTypeId, ...filterStatus(status) },
{ detail: { contains: query }, productTypeId, ...filterStatus(status) }, { detail: { contains: query }, productTypeId, ...filterStatus(status) },
], ],
AND: { AND: registeredBranchId
OR: [{ registeredBranchId: branchId }, { registeredBranchId: null }], ? {
}, OR: [{ registeredBranchId: registeredBranchId }, { registeredBranchId: null }],
}
: undefined,
} satisfies Prisma.ServiceWhereInput; } satisfies Prisma.ServiceWhereInput;
const [result, total] = await prisma.$transaction([ const [result, total] = await prisma.$transaction([