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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-11 12:29:59 +07:00
parent eef29b7564
commit ffca4ee36d
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/controllers/ReportController.ts
View file

@ -8828,6 +8828,7 @@ export class ReportController extends Controller {
commandNo: v.commandNo, commandNo: v.commandNo,
commandYear: v.commandYear, commandYear: v.commandYear,
commandId: v.commandId, commandId: v.commandId,
salaryLevel: salary.salaryLevel && salary.salaryLevelNew ? salary.salaryLevelNew : salary.salaryLevel,
}) })
.then(async () => { .then(async () => {
const before = null; const before = null;

17
src/controllers/SalaryPeriodController.ts
View file

@ -1570,11 +1570,18 @@ export class SalaryPeriodController extends Controller {
type: body.type == null ? "" : `${body.type.toUpperCase()}`, type: body.type == null ? "" : `${body.type.toUpperCase()}`,
}) })
.andWhere( .andWhere(
body.isRetire != null // body.isRetire != null
? body.isRetire == "1" // ? body.isRetire == "1"
? `profile.isRetired = true` // ? `profile.isRetired = true`
: `profile.isRetired = false` // : `profile.isRetired = false`
: "1=1", // : "1=1",
body.isRetire == null
? `profile.isRetired = false`
: body.isRetire == "1"
? `profile.isRetired = true`
: body.isRetire == "0"
? `profile.isRetired = false`
: "1=1",
) )
.andWhere({ .andWhere({
salaryOrgId: salaryOrg.id, salaryOrgId: salaryOrg.id,