From c22b5eb143260a98b9aab8fc3281ffa2a5ca2eed Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 28 十月 2022 18:07:42 +0800
Subject: [PATCH] 修改
---
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 116 ++++++++++++++++++++++++++-------------------------------
1 files changed, 53 insertions(+), 63 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index af61816..cccc442 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -4,79 +4,69 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.entity.user.UmsMenu">
- <id column="id" property="id" />
- <result column="parent_id" property="parentId" />
- <result column="create_time" property="createTime" />
- <result column="title" property="title" />
- <result column="level" property="level" />
- <result column="sort" property="sort" />
- <result column="name" property="name" />
- <result column="icon" property="icon" />
- <result column="hidden" property="hidden" />
+ <id column="id" property="id"/>
+ <result column="parent_id" property="parentId"/>
+ <result column="create_time" property="createTime"/>
+ <result column="title" property="title"/>
+ <result column="level" property="level"/>
+ <result column="sort" property="sort"/>
+ <result column="name" property="name"/>
+ <result column="icon" property="icon"/>
+ <result column="hidden" property="hidden"/>
</resultMap>
<select id="getMenuList" resultType="com.ycl.entity.user.UmsMenu">
- SELECT
- m.id id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title title,
- m.level level,
- m.sort sort,
- m.name name,
- m.icon icon,
- m.hidden 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
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id
- WHERE
- arr.admin_id = #{adminId}
+ 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
+ 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
+ LEFT JOIN ums_menu m ON rmr.menu_id = m.id
+ WHERE arr.admin_id = #{adminId}
AND m.id IS NOT NULL
- GROUP BY
- m.id
+ Order BY m.`level`, m.sort
</select>
<select id="getMenuListByRoleId" resultType="com.ycl.entity.user.UmsMenu">
- SELECT
- m.id id,
- m.parent_id parentId,
- m.create_time createTime,
- m.title title,
- m.level level,
- m.sort sort,
- m.name name,
- m.icon icon,
- m.hidden hidden
- FROM
- ums_role_menu_relation rmr
- LEFT JOIN ums_menu m ON rmr.menu_id = m.id
- WHERE
- rmr.role_id = #{roleId}
+ SELECT m.id id,
+ m.parent_id parentId,
+ m.create_time createTime,
+ m.title title,
+ m.level level,
+ m.sort sort,
+ m.name name,
+ m.icon icon,
+ m.hidden hidden
+ FROM ums_role_menu_relation rmr
+ LEFT JOIN ums_menu m ON rmr.menu_id = m.id and m.leaf = 1
+ WHERE rmr.role_id = #{roleId}
AND m.id IS NOT NULL
- GROUP BY
- m.id
+ GROUP BY m.id
</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 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>
</mapper>
--
Gitblit v1.8.0