This commit is contained in:
AdisakKanthawilang 2025-06-17 10:08:18 +07:00
parent f40333e67a
commit 1ef5914182

View file

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