fix
This commit is contained in:
parent
b56fced2d4
commit
259fbcf388
1 changed files with 16 additions and 16 deletions
|
|
@ -354,14 +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" },
|
||||||
});
|
});
|
||||||
const result = record.map((r) => ({
|
// const result = record.map((r) => ({
|
||||||
...r,
|
// ...r,
|
||||||
positionExecutive:
|
// positionExecutive:
|
||||||
r.positionExecutiveField
|
// r.positionExecutiveField
|
||||||
? `${r.positionExecutive}(${r.positionExecutiveField})`
|
// ? `${r.positionExecutive}(${r.positionExecutiveField})`
|
||||||
: r.positionExecutive ?? null,
|
// : r.positionExecutive ?? null,
|
||||||
}));
|
// }));
|
||||||
return new HttpSuccess(result);
|
return new HttpSuccess(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("position/{profileId}")
|
@Get("position/{profileId}")
|
||||||
|
|
@ -396,15 +396,15 @@ export class ProfileSalaryController extends Controller {
|
||||||
// order: { commandDateAffect: "ASC" },
|
// order: { commandDateAffect: "ASC" },
|
||||||
});
|
});
|
||||||
|
|
||||||
const result = record.map((r) => ({
|
// const result = record.map((r) => ({
|
||||||
...r,
|
// ...r,
|
||||||
positionExecutive:
|
// positionExecutive:
|
||||||
r.positionExecutiveField
|
// r.positionExecutiveField
|
||||||
? `${r.positionExecutive}(${r.positionExecutiveField})`
|
// ? `${r.positionExecutive}(${r.positionExecutiveField})`
|
||||||
: r.positionExecutive ?? null,
|
// : r.positionExecutive ?? null,
|
||||||
}));
|
// }));
|
||||||
|
|
||||||
return new HttpSuccess(result);
|
return new HttpSuccess(record);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Get("tenure/user")
|
@Get("tenure/user")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue