hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix act position condition

Browse source
This commit is contained in:
Warunee Tamkoo 2026-05-12 23:12:01 +07:00
parent 334ce4f5fc
commit f836ea503f
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/WorkflowController.ts
View file

@ -1088,11 +1088,10 @@ export class WorkflowController extends Controller {
if (body.isAct) { if (body.isAct) {
// ตำแหน่งของคนที่เลือกไปรักษาการ // ตำแหน่งของคนที่เลือกไปรักษาการ
let childPosition = ""; let childPosition = "";
if (x.posType === "อำนวยการ" || x.posType === "บริหาร") { if (x.positionSignChild) {
childPosition = x.posExecutiveName || ""; childPosition = x.positionSignChild;
if (!childPosition) { } else if (x.posExecutiveName) {
childPosition = `${x.position || ""}ระดับ${x.posLevel || ""}`.trim(); childPosition = x.posExecutiveName;
}
} else { } else {
childPosition = `${x.position || ""}${x.posLevel || ""}`.trim(); childPosition = `${x.position || ""}${x.posLevel || ""}`.trim();
} }

2
src/entities/view/viewDirectorActing.ts
View file

@ -128,4 +128,6 @@ export class viewDirectorActing {
key: string; key: string;
@ViewColumn() @ViewColumn()
positionSign: string; positionSign: string;
@ViewColumn()
positionSignChild: string;
} }