From ce0906314fca77f3fa8c66ea5d919b56a0115313 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Fri, 26 Sep 2025 23:40:00 +0700
Subject: [PATCH] =?UTF-8?q?fix=20=E0=B8=81=E0=B8=A3=E0=B8=93=E0=B8=B5?=
 =?UTF-8?q?=E0=B9=84=E0=B8=A1=E0=B9=88=E0=B8=A1=E0=B8=B5=E0=B8=9B=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=B0=E0=B8=A7=E0=B8=B1=E0=B8=95=E0=B8=B4=E0=B9=82=E0=B8=84?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=87=E0=B8=AA=E0=B8=A3=E0=B9=89=E0=B8=B2=E0=B8=87?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../02_organization/store/organizational.ts    |  2 +-
 src/modules/02_organization/views/main.vue     | 18 ++++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/modules/02_organization/store/organizational.ts b/src/modules/02_organization/store/organizational.ts
index 69628fdb9..b51b5dd79 100644
--- a/src/modules/02_organization/store/organizational.ts
+++ b/src/modules/02_organization/store/organizational.ts
@@ -24,7 +24,7 @@ export const useOrganizational = defineStore("organizationalStore", () => {
   const activeId = ref<string>(); // id โครงสร้างปัจจุบัน
   const draftId = ref<string>(); // id แบบร่างโครงสร้าง
   const historyId = ref<string>(); // id ประวัติโครงสร้าง
-  const historyDnaOrgId = ref<string>(); // id ของโครงสร้างสำหรับใช้ในเมนูสืบทอดตำแหน่ง
+  const historyDnaOrgId = ref<string>(""); // id ของโครงสร้างสำหรับใช้ในเมนูสืบทอดตำแหน่ง
   const isPublic = ref<boolean>(false); // การเผยแพร่
   const treeId = ref<string>(); // id โหนด
   const level = ref<number>(); // ระดับโหนด
diff --git a/src/modules/02_organization/views/main.vue b/src/modules/02_organization/views/main.vue
index b7459c161..114307838 100644
--- a/src/modules/02_organization/views/main.vue
+++ b/src/modules/02_organization/views/main.vue
@@ -94,16 +94,18 @@ async function fetchHistory() {
         (e: OrgRevision) => !e.orgRevisionIsDraft && !e.orgRevisionIsCurrent
       );
 
-      itemHistory.value = filterData.map((e: OrgRevision) => ({
-        id: e.orgRevisionId,
-        name: e.orgRevisionName,
-        orgRevisionCreatedAt: e.orgRevisionCreatedAt
-          ? date2Thai(e.orgRevisionCreatedAt)
-          : "",
-      }));
+      itemHistory.value =
+        filterData.map((e: OrgRevision) => ({
+          id: e.orgRevisionId,
+          name: e.orgRevisionName,
+          orgRevisionCreatedAt: e.orgRevisionCreatedAt
+            ? date2Thai(e.orgRevisionCreatedAt)
+            : "",
+        })) || [];
 
       // id ของโครงสร้างสำหรับใช้ในเมนูสืบทอดตำแหน่ง
-      store.historyDnaOrgId = itemHistory.value[0].id;
+      store.historyDnaOrgId =
+        itemHistory.value.length > 0 ? itemHistory.value[0].id : "";
     })
     .catch((err) => {
       messageError($q, err);