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,