diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 692783b4..5852b7b8 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -486,7 +486,7 @@ export class ProfileController extends Controller { ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}` : "", Level: item.educationLevel ?? "", - Degree: item.degree ? `${item.degree} ${item.field ? item.field : "" }`: "", + Degree: item.degree ? `${item.degree} ${item.field ? item.field : ""}` : "", Field: item.field ?? "-", })); const salarys = await this.salaryRepository.find({ @@ -4199,10 +4199,12 @@ export class ProfileController extends Controller { .orWhere( new Brackets((qb) => { if (body.keyword) { - qb.where(`profile.firstName LIKE :firstName`, { firstName: `%${firstName}%` }) - .orWhere(`profile.lastName LIKE :lastName`, { lastName: `%${lastName}%` }); + qb.where(`profile.firstName LIKE :firstName`, { firstName: `%${firstName}%` }).orWhere( + `profile.lastName LIKE :lastName`, + { lastName: `%${lastName}%` }, + ); } - }) + }), ) .orderBy("profile.citizenId", "ASC") .skip((body.page - 1) * body.pageSize) @@ -4622,6 +4624,7 @@ export class ProfileController extends Controller { lastName: profile.lastName, citizenId: profile.citizenId, position: profile.position, + isProbation: profile.isProbation, posLevelName: profile.posLevel == null ? null : profile.posLevel.posLevelName, posLevelRank: profile.posLevel == null ? null : profile.posLevel.posLevelRank, posLevelId: profile.posLevel == null ? null : profile.posLevel.id,