diff --git a/fund-admin/src/views/system/menu.vue b/fund-admin/src/views/system/menu.vue
index 4be7855..04105f6 100644
--- a/fund-admin/src/views/system/menu.vue
+++ b/fund-admin/src/views/system/menu.vue
@@ -231,7 +231,13 @@ const handleEdit = (row) => {
 }
 
 const handleSubmit = async () => {
-  await formRef.value.validate()
+  try {
+    await formRef.value.validate()
+  } catch (error) {
+    ElMessage.warning('请检查表单填写是否完整')
+    return
+  }
+  
   try {
     if (form.menuId) {
       await updateMenu(form.menuId, form)
@@ -243,6 +249,7 @@ const handleSubmit = async () => {
     dialogVisible.value = false
     loadTableData()
   } catch (error) {
+    console.error('菜单操作失败:', error)
     ElMessage.error(error.message || '操作失败')
   }
 }
diff --git a/fund-admin/src/views/system/role.vue b/fund-admin/src/views/system/role.vue
index 88755e4..abef997 100644
--- a/fund-admin/src/views/system/role.vue
+++ b/fund-admin/src/views/system/role.vue
@@ -232,7 +232,13 @@ const handleEdit = (row) => {
 }
 
 const handleSubmit = async () => {
-  await formRef.value.validate()
+  try {
+    await formRef.value.validate()
+  } catch (error) {
+    ElMessage.warning('请检查表单填写是否完整')
+    return
+  }
+  
   try {
     if (form.roleId) {
       await updateRole(form.roleId, form)
@@ -244,6 +250,7 @@ const handleSubmit = async () => {
     dialogVisible.value = false
     loadTableData()
   } catch (error) {
+    console.error('角色操作失败:', error)
     ElMessage.error(error.message || '操作失败')
   }
 }
@@ -269,7 +276,7 @@ const handleAssignMenu = async (row) => {
   try {
     // 加载菜单树
     const menuRes = await getMenuTree()
-    menuTreeData.value = buildMenuTree(menuRes.data)
+    menuTreeData.value = buildMenuTree(menuRes)
     
     // 加载角色已有菜单
     const menuIdsRes = await getRoleMenuIds(row.roleId)
@@ -277,9 +284,10 @@ const handleAssignMenu = async (row) => {
     
     // 等待对话框渲染完成后设置选中
     setTimeout(() => {
-      menuTreeRef.value.setCheckedKeys(menuIdsRes.data || [])
+      menuTreeRef.value.setCheckedKeys(menuIdsRes || [])
     }, 100)
   } catch (error) {
+    console.error('加载菜单失败:', error)
     ElMessage.error('加载菜单失败')
   }
 }