update
This commit is contained in:
parent
f40333e67a
commit
1ef5914182
1 changed files with 18 additions and 2 deletions
|
|
@ -354,7 +354,14 @@ export class ProfileSalaryController extends Controller {
|
||||||
where: { profileId: profileId, commandCode: In(["5", "6", "7"]) },
|
where: { profileId: profileId, commandCode: In(["5", "6", "7"]) },
|
||||||
order: { order: "ASC" },
|
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}")
|
@Get("position/{profileId}")
|
||||||
|
|
@ -388,7 +395,16 @@ export class ProfileSalaryController extends Controller {
|
||||||
order: { order: "ASC" },
|
order: { order: "ASC" },
|
||||||
// order: { commandDateAffect: "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")
|
@Get("tenure/user")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue