diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index e4dd00d..0ab91e2 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -170,6 +170,7 @@ export default {
    */
   workflow: `${workflow}/`,
   commanderPosexe: (type:string)=>`${workflow}/commander-posexe/${type}`,
+  commanderOperate: `${workflow}/commander/operate`,
 
   keycloakLogSSO: `${org}/keycloak/log/sso`,
 
diff --git a/src/modules/05_leave/components/FormLeave/Form.vue b/src/modules/05_leave/components/FormLeave/Form.vue
index ac50dc6..f92d057 100644
--- a/src/modules/05_leave/components/FormLeave/Form.vue
+++ b/src/modules/05_leave/components/FormLeave/Form.vue
@@ -61,11 +61,11 @@ const columns = ref<QTableProps["columns"]>([
     style: "font-size: 14px",
   },
   {
-    name: "posExecutiveNameOrg",
+    name: "posExecutiveName",
     align: "left",
     label: "ตำแหน่งทางการบริหาร",
     sortable: true,
-    field: "posExecutiveNameOrg",
+    field: "posExecutiveName",
     headerStyle: "font-size: 14px",
     style: "font-size: 14px",
   },
@@ -82,7 +82,7 @@ function onSubmit() {
     ? `${selected.value[0].prefix}${selected.value[0].firstName} ${selected.value[0].lastName}`
     : "";
 
-  dataStore.commanderPosition = selected.value[0].posExecutiveNameOrg;
+  dataStore.commanderPosition = selected.value[0].posExecutiveName;
 }
 
 function closeDialog() {
@@ -95,12 +95,13 @@ function closeDialog() {
 async function getCommander() {
   showLoader();
   await http
-    .put(config.API.commanderPosexe("operate"), {
+    .put(config.API.commanderOperate, {
       isAct: isAct.value,
-      keyword: search.value,
+      keyword: search.value.trim(),
       page: pagination.value.page,
       pageSize: pagination.value.rowsPerPage,
       keycloakId: storeData.formData.keycloakId,
+      type:storeData.officerType.toLocaleUpperCase() == 'OFFICER' ? 'officer':'employee'
     })
     .then((res) => {
       rows.value = res.data.result.data;