diff --git a/src/modules/02_users/components/Permissions/DialogAdd.vue b/src/modules/02_users/components/Permissions/DialogAdd.vue
index 10c87a95..21cc041e 100644
--- a/src/modules/02_users/components/Permissions/DialogAdd.vue
+++ b/src/modules/02_users/components/Permissions/DialogAdd.vue
@@ -79,6 +79,12 @@ function fetchListRoles() {
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
+      const findRole = data.find(
+        (e: Roles) => e.id === props.dataPosMaster.authRoleId
+      );
+      if (findRole) {
+        selected.value.push(findRole);
+      }
     })
     .catch((err) => {
       messageError($q, err);
@@ -100,13 +106,14 @@ function onSubmit() {
           authRoleId: arrayId[0],
           posMasterId: props.dataPosMaster.id,
         })
-        .then(() => {
-          closeDialog();
-          props.fetchDataTable(
+        .then(async () => {
+          await props.fetchDataTable(
             reqMaster.value.id,
             reqMaster.value.revisionId,
             reqMaster.value.type
           );
+          await success($q, "บันทึกข้อมูลสำเร็จ");
+          await closeDialog();
         })
         .catch((err) => {
           messageError($q, err);
diff --git a/src/modules/02_users/views/permissionsView.vue b/src/modules/02_users/views/permissionsView.vue
index be8355c5..ef500ae1 100644
--- a/src/modules/02_users/views/permissionsView.vue
+++ b/src/modules/02_users/views/permissionsView.vue
@@ -321,9 +321,13 @@ function onDeleteRole(id: string) {
           authRoleId: "",
           posMasterId: id,
         })
-        .then(() => {
-          fetchDataTable(reqMaster.id, reqMaster.revisionId, reqMaster.type);
-          success($q, "ลบข้อมูลสำเร็จ");
+        .then(async () => {
+          await fetchDataTable(
+            reqMaster.id,
+            reqMaster.revisionId,
+            reqMaster.type
+          );
+          await success($q, "ลบข้อมูลสำเร็จ");
         })
         .catch((err) => {
           messageError($q, err);