diff --git a/src/modules/05_placement/components/PersonalList/DialogOrders.vue b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
index 25ab6555c..fbe8b4e8d 100644
--- a/src/modules/05_placement/components/PersonalList/DialogOrders.vue
+++ b/src/modules/05_placement/components/PersonalList/DialogOrders.vue
@@ -188,11 +188,19 @@ function saveOrder() {
 }
 
 /** ฟังก์ชั่นสำหรับ filter รายการข้อมูลคนตามประเภทคำสั่งที่เลือก */
-function filterSelectOrder() {
+function filterSelectOrder(val: string) {
   const data = props.rows ? props.rows : [];
   selected.value = [];
-  rows.value = data;
-  rowsData.value = data;
+
+  if (val === "C-PM-01" || val === "C-PM-02") {
+    rows.value = rowsData.value = data;
+  } else {
+    rows.value = rowsData.value = data.filter(
+      (e: any) => e?.bmaOfficerCheck === "OFFICER"
+    );
+  }
+
+  onSearch();
 }
 
 /** ปิด Modal และล้างค่าที่เลือก */
@@ -248,7 +256,7 @@ watch(
 
 <template>
   <q-dialog v-model="modal" persistent>
-    <q-card style="width: 1200px; max-width: 80vw">
+    <q-card style="min-width: 80%">
       <DialogHeader :tittle="'ส่งไปออกคำสั่ง'" :close="closeModal" />
       <q-separator />
       <q-card-section>
diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index c1c4be31a..e69559cbd 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -754,7 +754,6 @@ function onSubmitDate() {
  */
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
-
   rowsOrder.value = rows.value.filter(
     (e: any) =>
       (DataStore.isStaff &&
@@ -1317,7 +1316,11 @@ onMounted(async () => {
                     ? 'table_ellipsis text-blue cursor-pointer'
                     : 'table_ellipsis '
                 "
-                @click="props.row.refCommandNo && props.row.commandId ? onRefCommand(props.row) : null"
+                @click="
+                  props.row.refCommandNo && props.row.commandId
+                    ? onRefCommand(props.row)
+                    : null
+                "
               >
                 {{ props.row.refCommandNo ? props.row.refCommandNo : "-" }}
               </div>