diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index cc237a5b..57844dae 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -4505,7 +4505,9 @@ export class CommandController extends Controller { position: profile.position, positionName: profile.position, positionType: profile?.posType?.posTypeName ?? null, - positionLevel: profile?.posLevel?.posLevelName ?? null, + positionLevel: profile?.posType && profile?.posLevel + ? `${profile?.posType?.posTypeShortName} ${profile?.posLevel?.posLevelName }` + : null, amount: item.amount ? item.amount : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null, mouthSalaryAmount: item.mouthSalaryAmount ? item.mouthSalaryAmount : null, @@ -4793,7 +4795,9 @@ export class CommandController extends Controller { commandId: item.commandId, position: profile.position, positionType: profile?.posType?.posTypeName ?? null, - positionLevel: profile?.posLevel?.posLevelName ?? null, + positionLevel: profile?.posType && profile?.posLevel + ? `${profile?.posType?.posTypeShortName} ${profile?.posLevel?.posLevelName }` + : null, amount: item.amount ? item.amount : null, amountSpecial: item.amountSpecial ? item.amountSpecial : null, positionSalaryAmount: item.positionSalaryAmount ? item.positionSalaryAmount : null,