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

no message

Browse source
This commit is contained in:
kittapath 2025-01-21 12:38:27 +07:00
parent 8f7dfc96af
commit c34224c315
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileController.ts
View file

@ -7335,10 +7335,10 @@ export class ProfileController extends Controller {
.orWhere(`posType.posTypeName LIKE :keyword`, {
keyword: `%${body.keyword}%`,
})
.where("profile.isLeave = false")
.orWhere(conditionFullName, {
keyword: `%${body.keyword}%`,
})
.andWhere("profile.isLeave = false")
.orderBy("profile.citizenId", "ASC")
.skip((body.page - 1) * body.pageSize)
.take(body.pageSize)

2
src/controllers/ProfileEmployeeController.ts
View file

@ -3191,7 +3191,7 @@ export class ProfileEmployeeController extends Controller {
.orWhere(conditionFullName, {
keyword: `%${body.keyword}%`,
})
.where("profileEmployee.isLeave = false")
.andWhere("profileEmployee.isLeave = false")
.orderBy("profileEmployee.citizenId", "ASC")
.skip((body.page - 1) * body.pageSize)
.take(body.pageSize)