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:
kittapath 2025-02-20 13:29:42 +07:00
commit e7f26048a5
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileController.ts
View file

@ -4795,7 +4795,7 @@ export class ProfileController extends Controller {
isRetire != undefined && isRetire != null
? isRetire == false
// ? `profile.dateLeave IS NULL`
? `profile.isLeave IS FALSE `
? `profile.isLeave IS FALSE`
: isRetire == true && retireType != undefined && retireType != null
// ? `profile.dateLeave IS NOT NULL AND profile.leaveType = '${retireType}'`
// : `profile.dateLeave IS NOT NULL`

6
src/controllers/ProfileEmployeeController.ts
View file

@ -1839,10 +1839,10 @@ export class ProfileEmployeeController extends Controller {
.andWhere(
isRetire != undefined && isRetire != null
? isRetire == false
? `profileEmployee.dateLeave IS NULL`
? `profileEmployee.isLeave IS FALSE`
: isRetire == true && retireType != undefined && retireType != null
? `profileEmployee.dateLeave IS NOT NULL AND profileEmployee.leaveType = '${retireType}'`
: `profileEmployee.dateLeave IS NOT NULL`
? `profileEmployee.isLeave IS TRUE AND profileEmployee.leaveType = '${retireType}'`
: `profileEmployee.isLeave IS TRUE`
: "1=1",
)
.andWhere("profileEmployee.employeeClass LIKE :type", {