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

Merge branch 'adiDev' into develop

Browse source
This commit is contained in:
AdisakKanthawilang 2025-08-22 12:06:47 +07:00
commit fd18644ef8
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/controllers/PositionController.ts
View file

@ -1401,10 +1401,12 @@ export class PositionController extends Controller {
const match = posMaster.positions.find((p:any) => p.id == x.id); const match = posMaster.positions.find((p:any) => p.id == x.id);
if(match){ if(match){
match.positionIsSelected = x.positionIsSelected??false; match.positionIsSelected = x.positionIsSelected??false;
match.orderNo = x.orderNo ?? null;
return match return match
}else{ }else{
x.id = x.id ?? undefined; x.id = x.id ?? undefined;
x.posMasterId = posMaster.id; x.posMasterId = posMaster.id;
x.orderNo = x.orderNo ?? null;
x.positionName = x.posDictName; x.positionName = x.posDictName;
x.positionField = x.posDictField; x.positionField = x.posDictField;
x.posExecutiveId = x.posExecutiveId || null x.posExecutiveId = x.posExecutiveId || null
@ -1516,12 +1518,13 @@ export class PositionController extends Controller {
relations: ["posType", "posLevel", "posExecutive"], relations: ["posType", "posLevel", "posExecutive"],
// order: { lastUpdatedAt: "ASC" }, // order: { lastUpdatedAt: "ASC" },
order: { order: {
posType: { // posType: {
posTypeRank: "ASC", // posTypeRank: "ASC",
}, // },
posLevel: { // posLevel: {
posLevelRank: "ASC", // posLevelRank: "ASC",
}, // },
orderNo: "ASC"
}, },
}); });
const formattedData = { const formattedData = {
@ -1539,6 +1542,7 @@ export class PositionController extends Controller {
positionSign: posMaster.positionSign, positionSign: posMaster.positionSign,
positions: positions.map((position) => ({ positions: positions.map((position) => ({
id: position.id, id: position.id,
orderNo: position.orderNo,
positionName: position.positionName, positionName: position.positionName,
positionField: position.positionField, positionField: position.positionField,
posTypeId: position.posTypeId, posTypeId: position.posTypeId,