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

add dna profile

Browse source
This commit is contained in:
kittapath 2025-02-03 15:40:44 +07:00
parent 70b9180d28
commit f4e8ec277e
2 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ProfileEmployeeController.ts
View file

@ -1626,7 +1626,7 @@ export class ProfileEmployeeController extends Controller {
: isRetire == true && retireType != undefined && retireType != null
? `profileEmployee.dateLeave IS NOT NULL AND profileEmployee.leaveType = '${retireType}'`
: `profileEmployee.dateLeave IS NOT NULL`
: "1=1"
: "1=1",
)
.andWhere("profileEmployee.employeeClass LIKE :type", {
type: "PERM",
@ -2258,6 +2258,7 @@ export class ProfileEmployeeController extends Controller {
child4ShortName: child4 == null ? null : child4.orgChild4ShortName,
node: null,
nodeId: null,
nodeDnaId: null,
salary: profile ? profile.amount : null,
amountSpecial: profile ? profile.amountSpecial : null,
posNo: