diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index b0151c2..8bf9a4a 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -4,4 +4,6 @@ const org = `${env.API_URI}/org`;
 
 export default {
   profilePosition: () => `${org}/profile/keycloak/position`,
+
+  searchCommander: `${org}/profile/search/commander`,
 };
diff --git a/src/modules/06_evaluate/components/step/step2.vue b/src/modules/06_evaluate/components/step/step2.vue
index ce2fff1..533b218 100644
--- a/src/modules/06_evaluate/components/step/step2.vue
+++ b/src/modules/06_evaluate/components/step/step2.vue
@@ -294,6 +294,7 @@ async function fetcheSigner(id: string) {
     })
     .catch(() => {
       store.statusUpload = false;
+      getCommander();
     })
     .finally(() => {
       hideLoader();
@@ -410,6 +411,21 @@ onMounted(async () => {
   downloadFile("6-ผลงานที่จะส่งประเมิน (เอกสารหมายเลข 11)");
 });
 
+function getCommander() {
+  http
+    .get(config.API.searchCommander)
+    .then((res) => {
+      const data = res.data.result;
+      formCommand.commanderFullname = data.commanderFullname;
+      formCommand.commanderPosition = data.commanderPosition;
+      formCommand.commanderAboveFullname = data.commanderAboveFullname;
+      formCommand.commanderAbovePosition = data.commanderAbovePosition;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {});
+}
 /** callback function */
 watch(
   () => store.checkFileupload,
diff --git a/src/modules/06_evaluate/components/step/step6.vue b/src/modules/06_evaluate/components/step/step6.vue
index 7b6317b..08bc414 100644
--- a/src/modules/06_evaluate/components/step/step6.vue
+++ b/src/modules/06_evaluate/components/step/step6.vue
@@ -158,6 +158,7 @@ async function fetcheSigner(id: string) {
     })
     .catch(() => {
       store.statusUpload = false;
+      getCommander();
     })
     .finally(() => {
       hideLoader();
@@ -222,6 +223,22 @@ onMounted(async () => {
   await fetchCheckDate();
 });
 
+function getCommander() {
+  http
+    .get(config.API.searchCommander)
+    .then((res) => {
+      const data = res.data.result;
+      formCommand.commanderFullname = data.commanderFullname;
+      formCommand.commanderPosition = data.commanderPosition;
+      formCommand.commanderAboveFullname = data.commanderAboveFullname;
+      formCommand.commanderAbovePosition = data.commanderAbovePosition;
+    })
+    .catch((e) => {
+      messageError($q, e);
+    })
+    .finally(() => {});
+}
+
 watch(
   () => store.checkFileupload,
   () => {