fix: empty query result in empty array
This commit is contained in:
parent
10a0ed0fc1
commit
927f972a91
1 changed files with 22 additions and 17 deletions
|
|
@ -10,25 +10,30 @@ export class EmploymentOfficeController extends Controller {
|
|||
async getEmploymentOfficeList(@Query() districtId?: string, @Query() query: string = "") {
|
||||
return await prisma.employmentOffice.findMany({
|
||||
where: {
|
||||
OR: [
|
||||
...(districtId
|
||||
OR:
|
||||
!!districtId || !!query
|
||||
? [
|
||||
{
|
||||
province: {
|
||||
district: { some: { id: districtId } },
|
||||
},
|
||||
district: { none: {} },
|
||||
},
|
||||
{
|
||||
district: {
|
||||
some: { districtId },
|
||||
},
|
||||
},
|
||||
...(districtId
|
||||
? [
|
||||
{
|
||||
province: {
|
||||
district: { some: { id: districtId } },
|
||||
},
|
||||
district: { none: {} },
|
||||
},
|
||||
{
|
||||
district: {
|
||||
some: { districtId },
|
||||
},
|
||||
},
|
||||
]
|
||||
: []),
|
||||
...(queryOrNot(query, [
|
||||
{ name: { contains: query } },
|
||||
{ nameEN: { contains: query } },
|
||||
]) ?? []),
|
||||
]
|
||||
: []),
|
||||
...(queryOrNot(query, [{ name: { contains: query } }, { nameEN: { contains: query } }]) ??
|
||||
[]),
|
||||
],
|
||||
: undefined,
|
||||
},
|
||||
orderBy: [{ provinceId: "asc" }, { id: "asc" }],
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue