From 64af16539603fb4e89c37d492a46f0dc4e08f3ec Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Thu, 14 Nov 2024 12:08:35 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B8=AD=E0=B8=81?=
 =?UTF-8?q?=E0=B8=AB=E0=B8=99=E0=B9=88=E0=B8=A7=E0=B8=A2=E0=B8=87=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=99=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B0=E0=B8=94=E0=B8=B1=E0=B8=9A=E0=B8=8A=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=89=E0=B8=99=E0=B8=87=E0=B8=B2=E0=B8=99/=E0=B8=82?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dialogs/DialogOrgSelect.vue         | 6 ++----
 src/components/Dialogs/DialogOrgSelectEmployee.vue | 4 +---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/Dialogs/DialogOrgSelect.vue b/src/components/Dialogs/DialogOrgSelect.vue
index a512dd017..684e28013 100644
--- a/src/components/Dialogs/DialogOrgSelect.vue
+++ b/src/components/Dialogs/DialogOrgSelect.vue
@@ -282,9 +282,7 @@ async function getDataTable(id: string, level: number = 0) {
         positionName: e.positionName,
         posTypeName: e.posTypeName,
         posLevelName: e.posLevelName,
-        positionIsSelected: e.positionIsSelected
-          ? e.fullNameCurrentHolder
-          : "-",
+        positionIsSelected: e.fullNameCurrentHolder,
         isSit: e.isSit,
         positions: e.positions,
         node: e.node,
@@ -663,7 +661,7 @@ onMounted(async () => {
                           <d-table
                             ref="table"
                             :columns="columns"
-                            :rows="positionData"
+                            :rows="positionNo"
                             :filter="filters"
                             row-key="id"
                             flat
diff --git a/src/components/Dialogs/DialogOrgSelectEmployee.vue b/src/components/Dialogs/DialogOrgSelectEmployee.vue
index 4a2f1fd56..bcea6fee4 100644
--- a/src/components/Dialogs/DialogOrgSelectEmployee.vue
+++ b/src/components/Dialogs/DialogOrgSelectEmployee.vue
@@ -267,9 +267,7 @@ async function getDataTable(id: string, level: number = 0) {
         positionName: e.positionName,
         posTypeName: e.posTypeName,
         posLevelName: e.posLevelName,
-        positionIsSelected: e.positionIsSelected
-          ? e.fullNameCurrentHolder
-          : "-",
+        positionIsSelected: e.fullNameCurrentHolder,
         isSit: e.isSit,
         positions: e.positions,
         node: e.node,