From 8675a9f5a5286e119a2b42bc4c6d7683b0443268 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Tue, 17 Jun 2025 09:17:24 +0700
Subject: [PATCH] fix

---
 src/controllers/ProfileGovernmentController.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/controllers/ProfileGovernmentController.ts b/src/controllers/ProfileGovernmentController.ts
index b1e313be..2d440801 100644
--- a/src/controllers/ProfileGovernmentController.ts
+++ b/src/controllers/ProfileGovernmentController.ts
@@ -204,15 +204,15 @@ export class ProfileGovernmentHistoryController extends Controller {
     let orgShortName = "";
     if (posMaster != null) {
       if (posMaster.orgChild1Id === null) {
-        orgShortName = posMaster.orgRoot?.orgRootShortName;
+        orgShortName = posMaster.orgRoot?.orgRootShortName ?? "";
       } else if (posMaster.orgChild2Id === null) {
-        orgShortName = posMaster.orgChild1?.orgChild1ShortName;
+        orgShortName = posMaster.orgChild1?.orgChild1ShortName ?? "";
       } else if (posMaster.orgChild3Id === null) {
-        orgShortName = posMaster.orgChild2?.orgChild2ShortName;
+        orgShortName = posMaster.orgChild2?.orgChild2ShortName ?? "";
       } else if (posMaster.orgChild4Id === null) {
-        orgShortName = posMaster.orgChild3?.orgChild3ShortName;
+        orgShortName = posMaster.orgChild3?.orgChild3ShortName ?? "";
       } else {
-        orgShortName = posMaster.orgChild4?.orgChild4ShortName;
+        orgShortName = posMaster.orgChild4?.orgChild4ShortName ?? "";
       }
     }
     const _OrgLeave = [