diff --git a/src/controllers/EmployeePositionController.ts b/src/controllers/EmployeePositionController.ts index f5d46585..415e7604 100644 --- a/src/controllers/EmployeePositionController.ts +++ b/src/controllers/EmployeePositionController.ts @@ -1156,7 +1156,7 @@ export class EmployeePositionController extends Controller { ...(body.keyword && (masterId.length > 0 ? { id: In(masterId) } - : keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})), + : /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })), }, ]; diff --git a/src/controllers/EmployeeTempPositionController.ts b/src/controllers/EmployeeTempPositionController.ts index da6398b9..ec17bef5 100644 --- a/src/controllers/EmployeeTempPositionController.ts +++ b/src/controllers/EmployeeTempPositionController.ts @@ -875,7 +875,7 @@ export class EmployeeTempPositionController extends Controller { ...(body.keyword && (masterId.length > 0 ? { id: In(masterId) } - : keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})), + : /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })), }, ]; let query = AppDataSource.getRepository(EmployeeTempPosMaster) diff --git a/src/controllers/PositionController.ts b/src/controllers/PositionController.ts index f6802130..a91a1b22 100644 --- a/src/controllers/PositionController.ts +++ b/src/controllers/PositionController.ts @@ -1821,7 +1821,7 @@ export class PositionController extends Controller { ...(body.keyword && (masterId.length > 0 ? { id: In(masterId) } - : keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})), + : /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })), }, ]; let [posMaster, total] = await AppDataSource.getRepository(PosMaster) @@ -2277,7 +2277,7 @@ export class PositionController extends Controller { ...(body.keyword && (masterId.length > 0 ? { 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 && (masterId.length > 0 ? { id: In(masterId) } - : keywordAsInt != null ? { posMasterNo: keywordAsInt } : {})), + : /^\d+$/.test(body.keyword) ? { posMasterNo: keywordAsInt } : { posMasterNo: Like(`%${body.keyword}%`) })), ...(!body.isAll && { isCondition: true }), }, ];