diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index aa8448da..48f906dc 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2622,6 +2622,7 @@ export class CommandController extends Controller { profileId: string; date?: Date | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; posNo: string | null; @@ -2828,6 +2829,7 @@ export class CommandController extends Controller { profileId: string; date?: Date | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; posNo: string | null; @@ -2910,6 +2912,7 @@ export class CommandController extends Controller { unStigma?: string | null; commandId?: string | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; isGovernment?: boolean | null; @@ -3007,6 +3010,7 @@ export class CommandController extends Controller { positionExecutive: position?.posExecutive?.posExecutiveName ?? null, amount: item.amount ? item.amount : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, + amountSpecial: item.amountSpecial ? item.amountSpecial : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, order: profile.profileSalary.length >= 0 @@ -3320,6 +3324,7 @@ export class CommandController extends Controller { unStigma?: string | null; commandId?: string | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; isGovernment?: boolean | null; @@ -3413,6 +3418,7 @@ export class CommandController extends Controller { // positionPathSide: position?.positionArea ?? "-", // positionExecutive: position?.posExecutive?.posExecutiveName ?? "-", amount: item.amount ? item.amount : null, + amountSpecial: item.amountSpecial ? item.amountSpecial : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, order: @@ -3536,6 +3542,7 @@ export class CommandController extends Controller { salaryRef?: string | null; commandId?: string | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; mpCee?: string | null; @@ -3629,6 +3636,7 @@ export class CommandController extends Controller { positionPathSide: position?.positionArea ?? null, positionExecutive: position?.posExecutive?.posExecutiveName ?? null, amount: item.amount ? item.amount : null, + amountSpecial: item.amountSpecial ? item.amountSpecial : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, order: @@ -3690,6 +3698,7 @@ export class CommandController extends Controller { salaryRef?: string | null; commandId?: string | null; amount?: Double | null; + amountSpecial?: Double | null; positionSalaryAmount?: Double | null; mouthSalaryAmount?: Double | null; isGovernment?: boolean | null; @@ -3798,6 +3807,7 @@ export class CommandController extends Controller { positionPathSide: position?.positionArea ?? null, positionExecutive: position?.posExecutive?.posExecutiveName ?? null, amount: item.amount ? item.amount : null, + amountSpecial: item.amountSpecial ? item.amountSpecial : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, order: @@ -4432,6 +4442,7 @@ export class CommandController extends Controller { FirstName?: any | null; LastName?: any | null; Amount?: any | null; + amountSpecial?: Double | null; PositionSalaryAmount?: any | null; MouthSalaryAmount?: any | null; RemarkHorizontal?: any | null; diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 8084cd20..69686bdc 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -7531,11 +7531,13 @@ export class ProfileController extends Controller { .where((qb) => { if (body.rootId) { qb.andWhere("posMaster.orgRootId = :rootId", { rootId: body.rootId }); + qb.andWhere("posMaster.current_nextId IS NOT NULL"); + } else { + qb.andWhere("posMaster.orgRevisionId = :orgRevisionId", { + orgRevisionId: findRevision?.id, + }); + qb.andWhere("posMaster.current_holderId IS NOT NULL"); } - qb.andWhere("posMaster.current_holderId IS NOT NULL"); - qb.andWhere("posMaster.orgRevisionId = :orgRevisionId", { - orgRevisionId: findRevision?.id, - }); }) .andWhere( new Brackets((qb) => {