From 8b0fdfd069333f412e6a7cd73bf68cebec66f4ed Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 12 Apr 2021 15:52:05 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 56 ++++++++------------------------------------------------
1 files changed, 8 insertions(+), 48 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 75e4ab4..1ba6ee4 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -15,59 +15,14 @@
<result column="is_delete" property="isDelete"/>
</resultMap>
- <!--������������������������������-->
- <resultMap id="ParentChildrenResultMap" type="com.moral.api.entity.ManageMenu">
- <id column="id" property="id"/>
- <result column="name" property="name"/>
- <result column="url" property="url"/>
- <result column="icon" property="icon"/>
- <result column="parent_id" property="parentId"/>
- <result column="order" property="order"/>
- <result column="create_time" property="createTime"/>
- <result column="update_time" property="updateTime"/>
- <result column="is_delete" property="isDelete"/>
- <collection property="children" ofType="com.moral.api.entity.ManageMenu" column="id" select="getChildrenByParentId"></collection>
- </resultMap>
<sql id="Base_Column_List">
mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete
</sql>
- <!--������������������������������������������-->
- <select id="getParentMenuByRoles" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List"></include>
- from
- manage_menu mm
- join
- manage_role_menu mrm
- on
- mm.`id` = mrm.`menu_id` and mm.`is_delete`=0
- join
- manage_role mr
- on
- mr.`id` = mrm.`role_id` and mr.`id` IN
- <foreach collection="list" separator="," open="(" close=")" item="role">
- #{role.id}
- </foreach>
- where
- mm.`is_delete`=0
- AND
- mm.`parent_id`=0;
- </select>
-
- <!--���������������Id������������������������-->
- <select id="getChildrenByParentId" parameterType="Integer" resultMap="BaseResultMap">
- SELECT
- <include refid="Base_Column_List"></include>
- FROM
- manage_menu mm
- WHERE
- mm.parent_id = #{value}
- </select>
<!--���������������������������������������-->
- <select id="getParentChildrenMenusByRoles" resultMap="ParentChildrenResultMap">
+ <select id="getAllMenusByRoles" resultMap="BaseResultMap">
select
DISTINCT
<include refid="Base_Column_List"></include>
@@ -86,8 +41,6 @@
</foreach>
where
mm.`is_delete`=0
- AND
- mm.`parent_id`=0;
</select>
<select id="getManageMenuByName" resultMap="BaseResultMap">
@@ -173,6 +126,13 @@
limit #{start},#{number}
</select>
+ <select id="getAll" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_menu mm
+ where mm.is_delete = 0
+ </select>
+
<select id="getManageRoleByNameFuzzy" parameterType="java.util.Map" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"></include>
--
Gitblit v1.8.0