From 9615ef3023e1a60d202e86178003a2b864191106 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期四, 07 十一月 2024 20:10:00 +0800
Subject: [PATCH] Merge branch 'master-v4' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v4

---
 src/main/resources/mapper/system/MenuMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/system/MenuMapper.xml b/src/main/resources/mapper/system/MenuMapper.xml
index e47ed1c..6036060 100644
--- a/src/main/resources/mapper/system/MenuMapper.xml
+++ b/src/main/resources/mapper/system/MenuMapper.xml
@@ -18,7 +18,7 @@
 	</select>
 
 	<select id="selectOperationList" resultType="com.mzl.flower.dto.response.system.MenuTreeDTO">
-		SELECT m.ID AS id, PARENT_ID AS parentId, NAME AS menuName, TYPE AS type
+		SELECT DISTINCT m.ID AS id, PARENT_ID AS parentId, NAME AS menuName, TYPE AS type
 			, ICON AS menuIcon, keepAlive, HREF AS menuHref, SEQ AS seq
 		FROM t_menu m
 		JOIN t_role_menu rm ON m.ID = rm.MENU_ID

--
Gitblit v1.9.3