From a1210c1efdc1a5e367163a0ef6eec35b89d85283 Mon Sep 17 00:00:00 2001
From: dubai <weichen0716@163.com>
Date: Sun, 11 Jan 2026 18:41:53 +0800
Subject: [PATCH] =?UTF-8?q?fix(menu):=20=E4=BF=AE=E5=A4=8D=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1menuSource=20-=20=E4=B8=8D=E4=BC=A0=E9=80=92?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=97=B6=E5=90=8E=E7=AB=AF=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BAruoyi=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts      | 1 +
 Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue     | 1 +
 .../apps/web-antd/src/views/system/menu/menu-drawer.vue         | 2 +-
 .../web-antd/src/views/tool/gen/edit-steps/basic-setting.vue    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts
index 5ee550b7..14baf918 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/api/system/menu/model.d.ts
@@ -54,4 +54,5 @@ export interface MenuQuery {
   menuName?: string;
   isShow?: boolean;
   state?: boolean;
+  menuSource: number;
 }
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue
index 9be5ad58..c90d0934 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/index.vue
@@ -50,6 +50,7 @@ const gridOptions: VxeGridProps<Record<string, any>> = {
       query: async (_, formValues = {}) => {
         const resp = await menuList({
           ...formValues,
+          menuSource: 2 // 不传后端会默认为ruoyi的菜单
         });
         // 统一处理数据：确保 menuId 和 parentId 存在，并将根节点的 parentId 置为 null
         const items = (resp || []).map((item) => {
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue
index d4fb231c..d693b303 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/system/menu/menu-drawer.vue
@@ -46,7 +46,7 @@ const [BasicForm, formApi] = useVbenForm({
 
 async function setupMenuSelect() {
   // menu
-  const menuArray = await menuList();
+  const menuArray = await menuList({ menuSource: 2 }); // 不传后端会默认为ruoyi的菜单
   // support i18n
   menuArray.forEach((item) => {
     item.menuName = $t(item.menuName);
diff --git a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue
index 0ffe258d..57f2a721 100644
--- a/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue
+++ b/Yi.Vben5.Vue3/apps/web-antd/src/views/tool/gen/edit-steps/basic-setting.vue
@@ -67,7 +67,7 @@ async function initTreeSelect(columns: Column[]) {
  * 加载菜单选择
  */
 async function initMenuSelect() {
-  const list = await menuList();
+  const list = await menuList({ menuSource: 2 }); // 不传后端会默认为ruoyi的菜单
   // support i18n
   list.forEach((item) => {
     item.menuName = $t(item.menuName);