From 3e13344198ce4e5df41d818136ed12cdde6412c9 Mon Sep 17 00:00:00 2001
From: mashuanghui <msh19861001@163.com>
Date: Wed, 14 Aug 2024 15:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/SysMenuMapper.xml   | 67 +++++++++----------
 1 file changed, 30 insertions(+), 37 deletions(-)

diff --git a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml
index 780cd89..fa71806 100644
--- a/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml
+++ b/chushang-modules/chushang-module-system/system-service/src/main/resources/mapper/SysMenuMapper.xml
@@ -141,43 +141,36 @@
         order by m.parent_id, m.order_num
     </select>
     <select id="selectMenuTreeByUserId" resultMap="SysMenuResult">
-        SELECT
-            m.menu_id,
-            m.parent_id,
-            m.menu_name,
-            m.path,
-            m.component,
-            m.`query`,
-            m.visible,
-            m.STATUS,
-            ifnull( m.perms, '' ) AS perms,
-            m.frame,
-            m.CACHE,
-            m.menu_type,
-            m.icon,
-            m.order_num,
-            m.create_time
-        FROM
-            sys_menu m
-            INNER JOIN sys_role_menu rm ON m.menu_id = rm.menu_id
-                AND rm.role_id in (
-                    SELECT
-                    ur.role_id
-                    FROM
-                    sys_user_role ur
-                    LEFT JOIN sys_role ro ON ur.role_id = ro.role_id
-                    LEFT JOIN sys_user u ON ur.user_id = u.user_id
-                    WHERE
-                    u.user_id = #{userId}
-                    AND ro.STATUS = 1
-                    )
-        WHERE
-            m.del_state = FALSE
-          AND m.menu_type IN ( 'M', 'C' )
-          AND m.`status` = TRUE
-        ORDER BY
-            m.parent_id,
-            m.order_num
+            SELECT DISTINCT
+                     m.menu_id,
+                     m.parent_id,
+                     m.menu_name,
+                     m.path,
+                     m.component,
+                     m.`query`,
+                     m.visible,
+                     m.STATUS,
+                     ifnull(m.perms, '') AS perms,
+                     m.frame,
+                     m.CACHE,
+                     m.menu_type,
+                     m.icon,
+                     m.order_num,
+                     m.create_time
+              FROM sys_menu m
+                       INNER JOIN sys_role_menu rm ON m.menu_id = rm.menu_id
+                  AND rm.role_id in (SELECT ur.role_id
+                                     FROM sys_user_role ur
+                                              LEFT JOIN sys_role ro ON ur.role_id = ro.role_id
+                                              LEFT JOIN sys_user u ON ur.user_id = u.user_id
+                                     WHERE u.user_id = #{userId}
+                                       AND ro.STATUS = 1)
+              WHERE m.del_state = FALSE
+                AND m.menu_type IN ('M', 'C')
+                AND m.`status` = TRUE
+            ORDER BY
+               m.parent_id,
+               m.order_num
     </select>
     <select id="selectMenuPermsByRoleId" resultType="java.lang.String">
         SELECT