From 1103be0d7ddee765fd54156ee8d57baa4e661a55 Mon Sep 17 00:00:00 2001
From: waruneeauy <warunee.auy@gmail.com>
Date: Wed, 1 May 2024 10:22:00 +0700
Subject: [PATCH] =?UTF-8?q?updated=20=E0=B8=9A=E0=B8=A3=E0=B8=A3=E0=B8=88?=
 =?UTF-8?q?=E0=B8=B8=E0=B9=81=E0=B8=95=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1?=
 =?UTF-8?q?=E0=B9=89=E0=B8=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../05_placement/components/PersonalList/Table.vue   | 12 +++++++++---
 src/modules/05_placement/stores/storeSelect.ts       |  4 ++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 623cc78f1..1ad8939c4 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -873,7 +873,9 @@ onMounted(async () => {
                   </q-item>
                   <q-item
                     v-if="
-                      (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
+                      (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
+                        roleAdmin &&
+                        props.row.statusId === 'UN-CONTAIN') ||
                       (props.row.draft === 'รอส่งตัว' &&
                         props.row.statusId !== 'DISCLAIM')
                     "
@@ -903,7 +905,9 @@ onMounted(async () => {
 
                   <q-item
                     v-if="
-                      (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
+                      (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
+                        roleAdmin &&
+                        props.row.statusId === 'UN-CONTAIN') ||
                       (props.row.draft === 'รอส่งตัว' &&
                         props.row.statusId !== 'DISCLAIM')
                     "
@@ -929,7 +933,9 @@ onMounted(async () => {
 
                   <q-item
                     v-if="
-                      (roleAdmin && props.row.statusId === 'UN-CONTAIN') ||
+                      (props.row.bmaOfficer !== 'บุคคลภายนอก' &&
+                        roleAdmin &&
+                        props.row.statusId === 'UN-CONTAIN') ||
                       (props.row.draft === 'รอส่งตัว' &&
                         props.row.statusId !== 'DISCLAIM')
                     "
diff --git a/src/modules/05_placement/stores/storeSelect.ts b/src/modules/05_placement/stores/storeSelect.ts
index 541646edc..7966eb63c 100644
--- a/src/modules/05_placement/stores/storeSelect.ts
+++ b/src/modules/05_placement/stores/storeSelect.ts
@@ -14,9 +14,9 @@ export const useSelectOrgStore = defineStore("selectorg", () => {
       isPosition: e.isPosition,
       posMasterNo:
         e.orgShortname +
-        e.posMasterNoPrefix +
+        (e.posMasterNoPrefix != null ? e.posMasterNoPrefix : "") +
         e.posMasterNo +
-        e.posMasterNoSuffix,
+        (e.posMasterNoSuffix != null ? e.posMasterNoSuffix : ""),
       positionName: e.positionName,
       posTypeName: e.posTypeName,
       posLevelName: e.posLevelName,