This commit is contained in:
parent
9288c9e833
commit
8b08f8b5c8
3 changed files with 5 additions and 5 deletions
|
|
@ -1156,7 +1156,7 @@ export class EmployeePositionController extends Controller {
|
||||||
...(body.keyword &&
|
...(body.keyword &&
|
||||||
(masterId.length > 0
|
(masterId.length > 0
|
||||||
? { id: In(masterId) }
|
? { id: In(masterId) }
|
||||||
: keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})),
|
: /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -875,7 +875,7 @@ export class EmployeeTempPositionController extends Controller {
|
||||||
...(body.keyword &&
|
...(body.keyword &&
|
||||||
(masterId.length > 0
|
(masterId.length > 0
|
||||||
? { id: In(masterId) }
|
? { id: In(masterId) }
|
||||||
: keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})),
|
: /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
let query = AppDataSource.getRepository(EmployeeTempPosMaster)
|
let query = AppDataSource.getRepository(EmployeeTempPosMaster)
|
||||||
|
|
|
||||||
|
|
@ -1821,7 +1821,7 @@ export class PositionController extends Controller {
|
||||||
...(body.keyword &&
|
...(body.keyword &&
|
||||||
(masterId.length > 0
|
(masterId.length > 0
|
||||||
? { id: In(masterId) }
|
? { id: In(masterId) }
|
||||||
: keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})),
|
: /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
let [posMaster, total] = await AppDataSource.getRepository(PosMaster)
|
let [posMaster, total] = await AppDataSource.getRepository(PosMaster)
|
||||||
|
|
@ -2277,7 +2277,7 @@ export class PositionController extends Controller {
|
||||||
...(body.keyword &&
|
...(body.keyword &&
|
||||||
(masterId.length > 0
|
(masterId.length > 0
|
||||||
? { id: In(masterId) }
|
? { id: In(masterId) }
|
||||||
: keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})),
|
: /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
@ -5502,7 +5502,7 @@ export class PositionController extends Controller {
|
||||||
...(body.keyword &&
|
...(body.keyword &&
|
||||||
(masterId.length > 0
|
(masterId.length > 0
|
||||||
? { id: In(masterId) }
|
? { id: In(masterId) }
|
||||||
: keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})),
|
: /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })),
|
||||||
...(!body.isAll && { isCondition: true }),
|
...(!body.isAll && { isCondition: true }),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue