hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-08-13 17:45:15 +07:00
commit 25b5d58f2a
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/controllers/ProfileController.ts
View file

@ -4164,6 +4164,7 @@ export class ProfileController extends Controller {
keyword?: string;
},
) {
const [firstName, lastName] = body.keyword ? body.keyword.split(" ") : ["", ""];
const [findProfile, total] = await AppDataSource.getRepository(Profile)
.createQueryBuilder("profile")
.leftJoinAndSelect("profile.posLevel", "posLevel")
@ -4177,7 +4178,10 @@ export class ProfileController extends Controller {
.leftJoinAndSelect("current_holders.orgChild4", "orgChild4")
.leftJoinAndSelect("current_holders.positions", "positions")
.leftJoinAndSelect("positions.posExecutive", "posExecutive")
.where(`profile.prefix LIKE :keyword`, {
.where(`profile.position LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`profile.prefix LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`profile.firstName LIKE :keyword`, {
@ -4186,15 +4190,20 @@ export class ProfileController extends Controller {
.orWhere(`profile.lastName LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`profile.position LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`posLevel.posLevelName LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`posType.posTypeName LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.orWhere(
new Brackets((qb) => {
if (body.keyword) {
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)
.take(body.pageSize)