From 22073364f141f4bc8a28a9d661c673ac91526efe Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 29 Jun 2024 19:08:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=A7=BB=E9=99=A4code=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=92=8C=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7=E5=A4=9A=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E8=8F=9C=E5=8D=95=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/SysMenuMapper.xml | 33 ++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/mapper/SysMenuMapper.xml b/src/main/resources/mapper/SysMenuMapper.xml
index e5b0ad22..df7ed021 100644
--- a/src/main/resources/mapper/SysMenuMapper.xml
+++ b/src/main/resources/mapper/SysMenuMapper.xml
@@ -25,25 +25,24 @@
     <!-- 获取路由列表 -->
     <select id="listRoutes" resultMap="RouteMap">
         SELECT
-           t1.id,
-           t1.name,
-           t1.parent_id,
-           t1.route_name,
-           t1.route_path,
-           t1.component,
-           t1.icon,
-           t1.sort,
-           t1.visible,
-           t1.redirect,
-           t1.type,
-           t3.code,
-           t1.always_show,
-           t1.keep_alive,
-           t1.params
+            DISTINCT t1.id,
+            t1.name,
+            t1.parent_id,
+            t1.route_name,
+            t1.route_path,
+            t1.component,
+            t1.icon,
+            t1.sort,
+            t1.visible,
+            t1.redirect,
+            t1.type,
+            t1.always_show,
+            t1.keep_alive,
+            t1.params
         FROM
             sys_menu t1
-                 LEFT JOIN sys_role_menu t2 ON t1.id = t2.menu_id
-                 LEFT JOIN sys_role t3 ON t2.role_id = t3.id
+                INNER JOIN sys_role_menu t2 ON t1.id = t2.menu_id
+                INNER JOIN sys_role t3 ON t2.role_id = t3.id AND t3.status = 1 AND t3.is_deleted = 0
         WHERE
             t1.type != '${@com.youlai.system.enums.MenuTypeEnum@BUTTON.getValue()}'
             <if test="roles != null and roles.size() > 0">