From d3af03b82eb1707b59007857c56b913d447805db Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 29 十一月 2022 16:37:40 +0800
Subject: [PATCH] bug修改
---
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index cccc442..80434cf 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -17,15 +17,15 @@
<select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
SELECT distinct m.id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title,
- m.url,
- m.level,
- m.sort,
- m.name,
- m.icon,
- m.hidden
+ m.parent_id parentId,
+ m.create_time createTime,
+ m.title,
+ m.url,
+ m.level,
+ m.sort,
+ m.name,
+ m.icon,
+ m.hidden
FROM ums_admin_role_relation arr
LEFT JOIN ums_role r ON arr.role_id = r.id
LEFT JOIN ums_role_menu_relation rmr ON r.id = rmr.role_id
@@ -52,21 +52,20 @@
</select>
<select id="adminMenuRelation" resultType="com.ycl.entity.user.vo.UmsMenuVo">
- SELECT amr.id AS relationId,
- amr.is_start AS isStart,
- amr.sort,
- m.id,
- m.parent_id AS parentId,
- m.title,
- m.url,
- m.`level`,
- m.description,
- m.create_time as createTime,
- m.hidden,
- m.icon
- FROM `ums_admin_menu_relation` AS amr
- JOIN ums_menu AS m ON amr.menu_id = m.id
- WHERE amr.admin_id = #{id}
+ SELECT distinct m.id,
+ m.parent_id AS parentId,
+ m.title,
+ m.url,
+ m.`level`,
+ m.description,
+ m.create_time as createTime,
+ m.hidden,
+ m.icon
+ FROM ums_admin_role_relation arr
+ INNER JOIN `ums_role_menu_relation` AS rmr on rmr.role_id = arr.role_id
+ JOIN ums_menu AS m ON rmr.menu_id = m.id
+ WHERE arr.admin_id = #{id}
+ order by m.id
</select>
</mapper>
--
Gitblit v1.8.0