refactor: only query if have
This commit is contained in:
parent
7bd9756e5d
commit
213ec28565
1 changed files with 26 additions and 24 deletions
|
|
@ -152,30 +152,32 @@ export class CustomerBranchController extends Controller {
|
||||||
@Query() pageSize: number = 30,
|
@Query() pageSize: number = 30,
|
||||||
) {
|
) {
|
||||||
const where = {
|
const where = {
|
||||||
OR: [
|
OR: query
|
||||||
{ registerName: { contains: query } },
|
? [
|
||||||
{ registerNameEN: { contains: query } },
|
{ registerName: { contains: query } },
|
||||||
{ email: { contains: query } },
|
{ registerNameEN: { contains: query } },
|
||||||
{ code: { contains: query } },
|
{ email: { contains: query } },
|
||||||
{ address: { contains: query } },
|
{ code: { contains: query } },
|
||||||
{ addressEN: { contains: query } },
|
{ address: { contains: query } },
|
||||||
{ province: { name: { contains: query } } },
|
{ addressEN: { contains: query } },
|
||||||
{ province: { nameEN: { contains: query } } },
|
{ province: { name: { contains: query } } },
|
||||||
{ district: { name: { contains: query } } },
|
{ province: { nameEN: { contains: query } } },
|
||||||
{ district: { nameEN: { contains: query } } },
|
{ district: { name: { contains: query } } },
|
||||||
{ subDistrict: { name: { contains: query } } },
|
{ district: { nameEN: { contains: query } } },
|
||||||
{ subDistrict: { nameEN: { contains: query } } },
|
{ subDistrict: { name: { contains: query } } },
|
||||||
{
|
{ subDistrict: { nameEN: { contains: query } } },
|
||||||
customer: {
|
{
|
||||||
OR: [
|
customer: {
|
||||||
{ firstName: { contains: query } },
|
OR: [
|
||||||
{ firstNameEN: { contains: query } },
|
{ firstName: { contains: query } },
|
||||||
{ lastName: { contains: query } },
|
{ firstNameEN: { contains: query } },
|
||||||
{ lastNameEN: { contains: query } },
|
{ lastName: { contains: query } },
|
||||||
],
|
{ lastNameEN: { contains: query } },
|
||||||
},
|
],
|
||||||
},
|
},
|
||||||
],
|
},
|
||||||
|
]
|
||||||
|
: undefined,
|
||||||
AND: {
|
AND: {
|
||||||
customer: isSystem(req.user)
|
customer: isSystem(req.user)
|
||||||
? undefined
|
? undefined
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue