diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index cb1e97c6..cde51643 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -3451,6 +3451,7 @@ export class CommandController extends Controller { posMasterId: posMaster.id, positionIsSelected: true, }, + relations: ["posType", "posLevel"] }); const dest_item = await this.salaryRepo.findOne({ where: { profileId: profile?.id }, @@ -3468,8 +3469,8 @@ export class CommandController extends Controller { mouthSalaryAmount: item.mouthSalaryAmount, posNo: shortName ?? null, position: position?.positionName ?? null, - positionType: position?.posTypeId ?? null, - positionLevel: position?.posLevelId ?? null, + positionType: position?.posType.posTypeName ?? null, + positionLevel: position?.posLevel.posLevelName ?? null, refCommandNo: `${item.commandNo}/${Extension.ToThaiYear(item.commandYear)}`, templateDoc: item.templateDoc, order: dest_item == null ? 1 : dest_item.order + 1, @@ -3521,13 +3522,13 @@ export class CommandController extends Controller { body: { refIds: { refId: string; - commandAffectDate: Date | null; - commandNo: string | null; - commandYear: number; - templateDoc: string | null; - amount: Double | null; - positionSalaryAmount: Double | null; - mouthSalaryAmount: Double | null; + // commandAffectDate: Date | null; + // commandNo: string | null; + // commandYear: number; + // templateDoc: string | null; + // amount: Double | null; + // positionSalaryAmount: Double | null; + // mouthSalaryAmount: Double | null; }[]; }, ) {