diff --git a/src/modules/05_placement/components/PersonalList/Table.vue b/src/modules/05_placement/components/PersonalList/Table.vue
index 22a211ade..e3e8060b7 100644
--- a/src/modules/05_placement/components/PersonalList/Table.vue
+++ b/src/modules/05_placement/components/PersonalList/Table.vue
@@ -249,7 +249,7 @@ const columnsBase = ref<QTableProps["columns"]>([
 ]);
 
 const columns = computed(() =>
-  roleAdmin.value
+  roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER"
     ? columnsBase.value
     : columnsBase.value?.filter(
         (col) =>
@@ -406,7 +406,8 @@ async function getTable() {
           rowsAll.value.push(rowData);
         });
 
-      const rowData = await (roleAdmin.value
+      const rowData = await (roleAdmin.value ||
+      checkPermission(route)?.attrOwnership == "OWNER"
         ? rowsAll.value
         : rowsAll.value.filter((x: any) => x.isDraft === true));
 
@@ -553,7 +554,10 @@ function getClass(val: boolean) {
  * @param draft status
  */
 function selectData(pid: string, draft: string) {
-  if (roleAdmin.value && draft === "ส่งตัวแล้ว") {
+  if (
+    (roleAdmin.value || checkPermission(route)?.attrOwnership == "OWNER") &&
+    draft === "ส่งตัวแล้ว"
+  ) {
     personalId.value = pid;
     modal.value = true;
     editRow.value = false;
@@ -863,9 +867,11 @@ async function getWorkFlow() {
       DataStore.isOfficer = data.isOfficer;
       DataStore.isStaff = data.isStaff;
       roleAdmin.value =
-        data.isOfficer ||
-        (checkPermission(route)?.attrOwnership == "OWNER" ? true : false);
-      if (roleAdmin.value === false) {
+        data.isOfficer || checkPermission(route)?.attrOwnership == "OWNER";
+      if (
+        roleAdmin.value === false &&
+        checkPermission(route)?.attrOwnership !== "OWNER"
+      ) {
         displayAdd.value = false;
         // visibleColumns.value = [
         //   "position",