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

update

Browse source
This commit is contained in:
AdisakKanthawilang 2025-06-16 13:58:39 +07:00
parent 69a2cfcddd
commit 87619410af
3 changed files with 37 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/controllers/CommandController.ts
View file

@ -3306,6 +3306,8 @@ export class CommandController extends Controller {
positionSalaryAmount?: Double | null;
mouthSalaryAmount?: Double | null;
positionExecutive: string | null;
positionExecutiveField?: string | null;
positionArea?: string | null;
positionType: string | null;
positionLevel: string | null;
isLeave: boolean;
@ -3623,6 +3625,8 @@ export class CommandController extends Controller {
orgChild3?: string | null;
orgChild4?: string | null;
positionExecutive?: string | null;
positionExecutiveField?: string | null;
positionArea?: string | null;
commandNo: string | null;
commandYear: number | null;
posNo: string | null;

31
src/controllers/ProfileController.ts
View file

@ -9954,6 +9954,35 @@ export class ProfileController extends Controller {
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.posExecutive
.posExecutiveName;
const positionExecutiveField =
position == null ||
item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField ==
null ||
item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField == null
? null
: item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionExecutiveField;
const positionArea =
position == null ||
item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionArea ==
null ||
item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionArea == null
? null
: item.current_holders
.find((x) => x.orgRevisionId == findRevision.id)
?.positions?.find((position) => position.positionIsSelected == true)?.positionArea;
const posExecutiveId =
position == null || position.posExecutive == null ? null : position.posExecutive.id;
@ -10071,6 +10100,8 @@ export class ProfileController extends Controller {
position: item.position,
posExecutiveId: posExecutiveId,
posExecutiveName: posExecutive,
positionExecutiveField: positionExecutiveField,
positionArea: positionArea,
node: node,
nodeId: nodeId,
nodeShortName: nodeShortName,

2
src/controllers/ProfileEmployeeController.ts
View file

@ -5553,6 +5553,8 @@ export class ProfileEmployeeController extends Controller {
node: node,
nodeId: nodeId,
nodeShortName: nodeShortName,
positionExecutiveField: null,
positionArea: null,
};
});
return new HttpSuccess(formattedData);