diff --git a/src/modules/18_command/components/Step/1_Detail.vue b/src/modules/18_command/components/Step/1_Detail.vue
index bf809382b..75d5aa992 100644
--- a/src/modules/18_command/components/Step/1_Detail.vue
+++ b/src/modules/18_command/components/Step/1_Detail.vue
@@ -171,20 +171,18 @@ async function fetchDataOperatorList() {
  * @param type ประเภท UP,DOWN
  * @param id ID เจ้าหน้าที่ดำเนินการที่ต้องการแก้ไขลำดับ
  */
-function onSwapData(type: string, id: string) {
-  dialogConfirm($q, async () => {
-    showLoader();
-    try {
-      await http.get(config.API.commandOperator + `/swap/${type}/${id}`);
+async function onSwapData(type: string, id: string) {
+  showLoader();
+  try {
+    await http.get(config.API.commandOperator + `/swap/${type}/${id}`);
 
-      await fetchDataOperatorList();
-      success($q, "บันทึกข้อมูลสำเร็จ");
-    } catch (err) {
-      messageError($q, err);
-    } finally {
-      hideLoader();
-    }
-  });
+    await fetchDataOperatorList();
+    success($q, "บันทึกข้อมูลสำเร็จ");
+  } catch (err) {
+    messageError($q, err);
+  } finally {
+    hideLoader();
+  }
 }
 
 /**
diff --git a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
index d8ca65090..f233725dd 100644
--- a/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
+++ b/src/modules/18_command/components/Step/Dialog1_AddOperetor.vue
@@ -315,7 +315,7 @@ watch(modal, (newVal) => {
           label="บันทึก"
           color="public"
           @click="onSubmit"
-          :disable="!roleName"
+          :disable="!roleName || selected.length === 0"
         />
       </q-card-actions>
     </q-card>