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

fix

Browse source
This commit is contained in:
AdisakKanthawilang 2024-03-01 15:37:30 +07:00
parent 16d718baa4
commit 4c2f7120ce
1 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/PositionController.ts
View file

@ -1156,7 +1156,6 @@ export class PositionController extends Controller {
) { ) {
body.type = 0; body.type = 0;
shortName = posMaster.orgRoot.orgRootShortName; shortName = posMaster.orgRoot.orgRootShortName;
// labelName = posMaster.orgRoot.orgRootName+" "+posMaster.orgRoot.orgRootCode + "00"+" "+posMaster.orgRoot.orgRootShortName;
} else if ( } else if (
posMaster.orgRootId !== null && posMaster.orgRootId !== null &&
posMaster.orgChild1Id !== null && posMaster.orgChild1Id !== null &&
@ -1165,7 +1164,6 @@ export class PositionController extends Controller {
) { ) {
body.type = 1; body.type = 1;
shortName = posMaster.orgChild1.orgChild1ShortName; shortName = posMaster.orgChild1.orgChild1ShortName;
// labelName = posMaster.orgChild1.orgChild1Name+" "+posMaster.orgChild1.orgChild1Code + "00"+" "+posMaster.orgChild1.orgChild1ShortName;
} else if ( } else if (
posMaster.orgRootId !== null && posMaster.orgRootId !== null &&
posMaster.orgChild1Id !== null && posMaster.orgChild1Id !== null &&
@ -1174,7 +1172,6 @@ export class PositionController extends Controller {
) { ) {
body.type = 2; body.type = 2;
shortName = posMaster.orgChild2.orgChild2ShortName; shortName = posMaster.orgChild2.orgChild2ShortName;
// labelName = posMaster.orgChild2.orgChild2Name+" "+posMaster.orgChild2.orgChild2Code + "00"+" "+posMaster.orgChild2.orgChild2ShortName;
} else if ( } else if (
posMaster.orgRootId !== null && posMaster.orgRootId !== null &&
posMaster.orgChild1Id !== null && posMaster.orgChild1Id !== null &&
@ -1183,7 +1180,6 @@ export class PositionController extends Controller {
) { ) {
body.type = 3; body.type = 3;
shortName = posMaster.orgChild3.orgChild3ShortName; shortName = posMaster.orgChild3.orgChild3ShortName;
// labelName = posMaster.orgChild3.orgChild3Name+" "+posMaster.orgChild3.orgChild3Code + "00"+" "+posMaster.orgChild3.orgChild3ShortName;
} else if ( } else if (
posMaster.orgRootId !== null && posMaster.orgRootId !== null &&
posMaster.orgChild1Id !== null && posMaster.orgChild1Id !== null &&
@ -1192,7 +1188,6 @@ export class PositionController extends Controller {
) { ) {
body.type = 4; body.type = 4;
shortName = posMaster.orgChild4.orgChild4ShortName; shortName = posMaster.orgChild4.orgChild4ShortName;
// labelName = posMaster.orgChild4.orgChild4Name+" "+posMaster.orgChild4.orgChild4Code + "00"+" "+posMaster.orgChild4.orgChild4ShortName;
} }
return { return {
@ -1214,7 +1209,6 @@ export class PositionController extends Controller {
? null ? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`, : `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
orgShortname: shortName, orgShortname: shortName,
// labelName: labelName,
isSit: posMaster.isSit, isSit: posMaster.isSit,
profilePosition: profile == null || profile.position == null ? null : profile.position, profilePosition: profile == null || profile.position == null ? null : profile.position,
profilePostype: type == null || type.posTypeName == null ? null : type.posTypeName, profilePostype: type == null || type.posTypeName == null ? null : type.posTypeName,
@ -1571,17 +1565,19 @@ export class PositionController extends Controller {
...type3LastPosMasterNo, ...type3LastPosMasterNo,
...type4LastPosMasterNo, ...type4LastPosMasterNo,
]; ];
console.log("allLast>>>>>>>>:",allLastPosMasterNo);
console.log("type>>>>>>>>:",requestBody.type);
console.log("data>>>>>>>>:",type2LastPosMasterNo);
const maxPosMasterNo = Math.max( const maxPosMasterNo = Math.max(
...allLastPosMasterNo.map((pos) => pos.posMasterNo), ...allLastPosMasterNo.map((pos) => pos.posMasterNo),
0 0
); );
console.log("max>>>>>>>>:",maxPosMasterNo); const maxPosMasterOrder = Math.max(
...allLastPosMasterNo.map((pos) => pos.posMasterOrder),
0
);
posMaster.posMasterNo = maxPosMasterNo + 1; posMaster.posMasterNo = maxPosMasterNo + 1;
posMaster.posMasterNo = maxPosMasterOrder + 1;
posMaster.createdUserId = request.user.sub; posMaster.createdUserId = request.user.sub;
posMaster.createdFullName = request.user.name; posMaster.createdFullName = request.user.name;
posMaster.lastUpdateUserId = request.user.sub; posMaster.lastUpdateUserId = request.user.sub;