From c775c6953d9759e70f08acbfa8f6d7490aaae3d1 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 26 九月 2024 21:13:53 +0800
Subject: [PATCH] 1
---
ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml | 107 ++++++++++++++++++++++++++---------------------------
1 files changed, 53 insertions(+), 54 deletions(-)
diff --git a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
index 3d8bac3..b368ed3 100644
--- a/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
+++ b/ycl-common/src/main/resources/mapper/user/UmsMenuMapper.xml
@@ -4,70 +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,
- m.*
- 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,
+ m.sort
+ 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} and m.hidden = false
+ order by m.sort
</select>
</mapper>
--
Gitblit v1.8.0