diff --git a/src/controllers/WorkflowController.ts b/src/controllers/WorkflowController.ts index cb06f1b7..ae5c8859 100644 --- a/src/controllers/WorkflowController.ts +++ b/src/controllers/WorkflowController.ts @@ -1088,11 +1088,10 @@ export class WorkflowController extends Controller { if (body.isAct) { // ตำแหน่งของคนที่เลือกไปรักษาการ let childPosition = ""; - if (x.posType === "อำนวยการ" || x.posType === "บริหาร") { - childPosition = x.posExecutiveName || ""; - if (!childPosition) { - childPosition = `${x.position || ""}ระดับ${x.posLevel || ""}`.trim(); - } + if (x.positionSignChild) { + childPosition = x.positionSignChild; + } else if (x.posExecutiveName) { + childPosition = x.posExecutiveName; } else { childPosition = `${x.position || ""}${x.posLevel || ""}`.trim(); } diff --git a/src/entities/view/viewDirectorActing.ts b/src/entities/view/viewDirectorActing.ts index ac988e1c..a9c8b096 100644 --- a/src/entities/view/viewDirectorActing.ts +++ b/src/entities/view/viewDirectorActing.ts @@ -128,4 +128,6 @@ export class viewDirectorActing { key: string; @ViewColumn() positionSign: string; + @ViewColumn() + positionSignChild: string; }