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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-04-09 15:16:11 +07:00
commit e4710ed004
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ReportController.ts
View file

@ -1810,7 +1810,7 @@ export class ReportController extends Controller {
salaryPeriodId: salaryPeriodId, salaryPeriodId: salaryPeriodId,
}, },
type: "NONE", //ไม่ได้เลื่อน type: "NONE", //ไม่ได้เลื่อน
isRetired: false, //กรองเฉพาะคนที่ไม่เกษียณ isRetired: salaryPeriod.period === 'APR' ? In([true, false]) : false, //กรองเฉพาะคนที่ไม่เกษียณเฉพาะรอบตุลา
}, },
order: { order: {
salaryOrg: { salaryOrg: {