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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-23 10:07:50 +07:00
commit 732467965e
1 changed files with 171 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/PositionController.ts
View file

@ -3049,7 +3049,6 @@ export class PositionController extends Controller {
.orderBy("posMaster.posMasterOrder", "ASC") .orderBy("posMaster.posMasterOrder", "ASC")
.getManyAndCount(); .getManyAndCount();
const formattedData = await Promise.all( const formattedData = await Promise.all(
posMaster.map(async (posMaster) => { posMaster.map(async (posMaster) => {
let shortName = ""; let shortName = "";
@ -3113,7 +3112,12 @@ export class PositionController extends Controller {
node = 0; node = 0;
nodeId = posMaster.orgRootId; nodeId = posMaster.orgRootId;
} }
const fullname = posMaster.current_holder.prefix + " " + posMaster.current_holder.firstName + " " + posMaster.current_holder.lastName; const fullname =
posMaster.current_holder.prefix +
" " +
posMaster.current_holder.firstName +
" " +
posMaster.current_holder.lastName;
return { return {
id: posMaster.id, id: posMaster.id,
node: node, node: node,
@ -3129,6 +3133,7 @@ export class PositionController extends Controller {
orgShortname: shortName, orgShortname: shortName,
isSit: posMaster.isSit, isSit: posMaster.isSit,
name: fullname, name: fullname,
profileId: posMaster.current_holder.id,
citizenId: posMaster.current_holder.citizenId, citizenId: posMaster.current_holder.citizenId,
position: posMaster.current_holder.position, position: posMaster.current_holder.position,
}; };