diff --git a/src/controllers/SalaryPeriodController.ts b/src/controllers/SalaryPeriodController.ts index 06dbc9e..3e7861e 100644 --- a/src/controllers/SalaryPeriodController.ts +++ b/src/controllers/SalaryPeriodController.ts @@ -441,7 +441,13 @@ export class SalaryPeriodController extends Controller { async GetListsSalaryProfile( @Path() id: string, @Body() - body: { page: number; pageSize: number; keyword?: string; type?: any; isRetire?: boolean }, + body: { + page: number; + pageSize: number; + keyword?: string; + type?: any; + isRetire?: boolean | null; + }, ) { const salaryOrg = await this.salaryOrgRepository.findOne({ where: { @@ -455,12 +461,10 @@ export class SalaryPeriodController extends Controller { .createQueryBuilder("profile") .andWhere( new Brackets((qb) => { - qb.andWhere(body.type != null && body.type != "" ? "profile.type LIKE :type" : "1=1", { - type: `%${body.type.toUpperCase()}%`, + qb.andWhere(body.type != null && body.type != "" ? `profile.type LIKE :type` : "1=1", { + type: body.type == null ? "" : `%${body.type.toUpperCase()}%`, }) - .andWhere(body.isRetire != null ? "profile.isRetire = :isRetire" : "1=1", { - isRetire: `${body.isRetire}`, - }) + .andWhere(body.isRetire != null ? `profile.isRetired = ${body.isRetire}` : "1=1") .andWhere({ salaryOrgId: salaryOrg.id, })