diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index a54932ebe..2892a916c 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -769,6 +769,8 @@ function onSubmitDate() {
  */
 function openModalOrder(val: boolean) {
   // ยังไม่ได้ดัก ส่ง ไป ทั้ง object #e.draft == "รอส่งตัว" &&
+  console.log(rowsOrder.value);
+
   rowsOrder.value = rows.value.filter(
     (e: any) =>
       (DataStore.isStaff &&
@@ -779,7 +781,15 @@ function openModalOrder(val: boolean) {
         e.statusId !== "REPORT" &&
         e.statusId !== "DONE") ||
       (DataStore.isOfficer &&
-        // e.bmaOfficer != "บุคคลภายนอก" &&
+        e.bmaOfficer != "บุคคลภายนอก" &&
+        e.rootId != e.rootIdOld &&
+        e.draft == "ส่งตัวแล้ว" &&
+        e.nodeName !== null &&
+        e.reportingDate !== null &&
+        e.statusId !== "REPORT" &&
+        e.statusId !== "DONE") ||
+      (DataStore.isOfficer &&
+        e.root === "สำนักปลัดกรุงเทพมหานคร" &&
         e.rootId != e.rootIdOld &&
         e.draft == "ส่งตัวแล้ว" &&
         e.nodeName !== null &&