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