diff --git a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
index c7319b9c175ec0eacce5cfc6edfa704efdd0ed91..a495dbd9d520b9254ab7e1c1e9e0c6e615c8d0ea 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-data-permission-form.vue
@@ -74,11 +74,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
index aa1843f96f47fa3731db787fb0c1f0d55b57e53e..1d62398c3abb8ce71b756bcc9562760bd76a8fa5 100644
--- a/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-antd/src/views/system/role/modules/assign-menu-form.vue
@@ -72,13 +72,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
index 8a74784175e6cb587e45dee5c7ef27b03539f3ba..08597ebf9f04529e2240c9194b17b49f04a457f5 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-data-permission-form.vue
@@ -74,11 +74,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
index 36634ccbd3d7a4e72e9168c3965d283870073644..b7e11b513c0af45259fc7202f60bcb67c9b0a3c0 100644
--- a/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-ele/src/views/system/role/modules/assign-menu-form.vue
@@ -69,13 +69,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue b/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
index 892aefad61176ffc8398709cb50f9c42bbc0972e..21ac3d9fda508790e2fd096feb4c25c9e377b715 100644
--- a/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
+++ b/apps/web-naive/src/views/system/role/modules/assign-data-permission-form.vue
@@ -75,11 +75,11 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(await getRole(data.id as number));
-
       // 加载部门列表
       await loadDeptTree();
       toggleExpandAll();
+      // 设置表单值, 一定要在加载树之后
+      await formApi.setValues(await getRole(data.id as number));
     } finally {
       modalApi.unlock();
     }
diff --git a/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
index 683d1f827f71cc88cc16d0c9277409d0d6e866ac..30ff77c0d6a8fc13d55fc97f344a8d0c5803baa6 100644
--- a/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
+++ b/apps/web-naive/src/views/system/role/modules/assign-menu-form.vue
@@ -69,13 +69,13 @@ const [Modal, modalApi] = useVbenModal({
     }
     modalApi.lock();
     try {
-      await formApi.setValues(data);
-
       // 加载角色菜单
       const menuIds = await getRoleMenuList(data.id as number);
       await formApi.setFieldValue('menuIds', menuIds);
       // 加载菜单列表
       await loadMenuTree();
+
+      await formApi.setValues(data);
     } finally {
       modalApi.unlock();
     }
diff --git a/playground/src/views/system/role/modules/form.vue b/playground/src/views/system/role/modules/form.vue
index cae54a1c679cfbb3a56b443cecc19ec6ea35ebaf..25b6fedca64be29137d65620f63e2c598956a677 100644
--- a/playground/src/views/system/role/modules/form.vue
+++ b/playground/src/views/system/role/modules/form.vue
@@ -47,10 +47,13 @@ const [Drawer, drawerApi] = useVbenDrawer({
         drawerApi.unlock();
       });
   },
-  onOpenChange(isOpen) {
+  async onOpenChange(isOpen) {
     if (isOpen) {
       const data = drawerApi.getData<SystemRoleApi.SystemRole>();
       formApi.resetForm();
+      if (permissions.value.length === 0) {
+        await loadPermissions();
+      }
       if (data) {
         formData.value = data;
         id.value = data.id;
@@ -58,10 +61,6 @@ const [Drawer, drawerApi] = useVbenDrawer({
       } else {
         id.value = undefined;
       }
-
-      if (permissions.value.length === 0) {
-        loadPermissions();
-      }
     }
   },
 });