hrms-bangkok/hrms-api-org
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-06-20 11:59:29 +07:00
parent b56fced2d4
commit 259fbcf388
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/controllers/ProfileSalaryController.ts
View file

@ -354,14 +354,14 @@ export class ProfileSalaryController extends Controller {
where: { profileId: profileId, commandCode: In(["5", "6", "7"]) },
order: { order: "ASC" },
});
const result = record.map((r) => ({
...r,
positionExecutive:
r.positionExecutiveField
? `${r.positionExecutive}(${r.positionExecutiveField})`
: r.positionExecutive ?? null,
}));
return new HttpSuccess(result);
// const result = record.map((r) => ({
// ...r,
// positionExecutive:
// r.positionExecutiveField
// ? `${r.positionExecutive}(${r.positionExecutiveField})`
// : r.positionExecutive ?? null,
// }));
return new HttpSuccess(record);
}
@Get("position/{profileId}")
@ -396,15 +396,15 @@ export class ProfileSalaryController extends Controller {
// order: { commandDateAffect: "ASC" },
});
const result = record.map((r) => ({
...r,
positionExecutive:
r.positionExecutiveField
? `${r.positionExecutive}(${r.positionExecutiveField})`
: r.positionExecutive ?? null,
}));
// const result = record.map((r) => ({
// ...r,
// positionExecutive:
// r.positionExecutiveField
// ? `${r.positionExecutive}(${r.positionExecutiveField})`
// : r.positionExecutive ?? null,
// }));
return new HttpSuccess(result);
return new HttpSuccess(record);
}
@Get("tenure/user")