fix issue #1184 รายการปรับระดับชั้นงาน+ย้าย (ตัวย่อระดับชั้นงานแสดงไม่ครบ)

2025-02-11 19:53:28 +07:00 · 2025-02-11 19:53:28 +07:00 · 86b1e55aee
commit 86b1e55aee
parent 7878d912b1
2 changed files with 5 additions and 3 deletions
--- a/src/controllers/PositionController.ts
+++ b/src/controllers/PositionController.ts
@ -4383,7 +4383,9 @@ export class PositionController extends Controller {
            posTypeId: position.posTypeId,
            posTypeName: position.posType == null ? null : position.posType.posTypeName,
            posLevelId: position.posLevelId,
-            posLevelName: position.posLevel == null ? null : position.posLevel.posLevelName,
+            posLevelName: position.posType == null && position.posLevel == null 
+              ? null 
+              : `${position.posType.posTypeShortName} ${position.posLevel.posLevelName}`,
            // posExecutiveId: position.posExecutiveId,
            // posExecutiveName:
            //   position.posExecutive == null ? null : position.posExecutive.posExecutiveName,