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/hrms-api-org into develop

Browse source
This commit is contained in:
mamoss 2025-05-21 15:13:19 +07:00
commit ff3eea0ec3
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/controllers/ProfileController.ts
View file

@ -8917,12 +8917,6 @@ export class ProfileController extends Controller {
keyword: `%${body.keyword}%`,
},
)
// .orWhere(`profile.firstName LIKE :keyword and profile.isProbation = ${isProbation}`, {
// keyword: `%${body.keyword}%`,
// })
// .orWhere(`profile.lastName LIKE :keyword and profile.isProbation = ${isProbation}`, {
// keyword: `%${body.keyword}%`,
// })
.orWhere(`profile.position LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
@ -8934,6 +8928,21 @@ export class ProfileController extends Controller {
)
.orWhere(`posType.posTypeName LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`orgRoot.orgRootName LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`orgChild1.orgChild1Name LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`orgChild2.orgChild2Name LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`orgChild3.orgChild3Name LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
})
.orWhere(`orgChild4.orgChild4Name LIKE :keyword and profile.isProbation = ${isProbation}`, {
keyword: `%${body.keyword}%`,
});
}),
)