diff --git a/src/modules/06_retirement/components/02_resign/ResignByid.vue b/src/modules/06_retirement/components/02_resign/ResignByid.vue
index bd5cbc862..1c944a808 100644
--- a/src/modules/06_retirement/components/02_resign/ResignByid.vue
+++ b/src/modules/06_retirement/components/02_resign/ResignByid.vue
@@ -371,15 +371,16 @@ function popUp(action: "pass" | "passNot", type: string) {
 }
 
 //เงื่อนไขpop up
-function onSubmit(type: string) {
+function onSubmit() {
+  console.log(roleUser.value);
   if (actionPass.value) {
-    if (type !== "approver") {
+    if (roleUser.value == "commander") {
       confirmpopUp("/comander");
     } else {
       confirmpopUp("");
     }
   } else {
-    if (type !== "approver") {
+    if (roleUser.value == "commander") {
       rejectpopUp("/comander");
     } else {
       rejectpopUp("");
@@ -1752,7 +1753,7 @@ onMounted(async () => {
 
   <q-dialog v-model="modal" persistent>
     <q-card style="width: 800px">
-      <q-form greedy @submit.prevent @validation-success="onSubmit('approver')">
+      <q-form greedy @submit.prevent @validation-success="onSubmit()">
         <DialogHeader
           :tittle="`${actionPass ? 'อนุญาตการลาออก' : 'ยับยั้งการลาออก'}`"
           :close="closeModal"