From ec12ec5a72d2f357a9f5dc9db7044b9469513f0d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 13:07:04 +0800
Subject: [PATCH] 因子默认单位添加；角色、菜单更新
---
screen-manage/src/main/resources/mapper/ManageMenuMapper.xml | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 78 insertions(+), 53 deletions(-)
diff --git a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
index 7dbef4e..64a0bd7 100644
--- a/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
+++ b/screen-manage/src/main/resources/mapper/ManageMenuMapper.xml
@@ -13,61 +13,17 @@
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="is_delete" property="isDelete"/>
+ <result column="desc" property="desc"/>
</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
+ mm.id,mm.name,mm.url,mm.icon,mm.parent_id,mm.order,mm.create_time,mm.update_time,mm.is_delete,mm.desc
</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>
@@ -76,7 +32,7 @@
join
manage_role_menu mrm
on
- mm.`id` = mrm.`menu_id` and mm.`is_delete`=0
+ mm.`id` = mrm.`menu_id` and mrm.`is_delete`=0
join
manage_role mr
on
@@ -86,8 +42,6 @@
</foreach>
where
mm.`is_delete`=0
- AND
- mm.`parent_id`=0;
</select>
<select id="getManageMenuByName" resultMap="BaseResultMap">
@@ -114,11 +68,14 @@
<if test="icon != null">
icon,
</if>
- <if test="parent_id != null">
+ <if test="parentId != null">
parent_id,
</if>
<if test="order != null">
`order`,
+ </if>
+ <if test="desc != null">
+ `desc`,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -131,11 +88,14 @@
<if test="icon != null">
#{icon},
</if>
- <if test="parent_id != null">
- #{parent_id},
+ <if test="parentId != null">
+ #{parentId},
</if>
<if test="order != null">
#{order},
+ </if>
+ <if test="desc != null">
+ #{desc},
</if>
</trim>
</insert>
@@ -161,8 +121,73 @@
<if test="is_delete != null">
is_delete = #{is_delete},
</if>
+ <if test="desc != null">
+ `desc` = #{desc},
+ </if>
</set>
where id = #{id}
</update>
+ <select id="getDataWithPage" parameterType="java.util.Map" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_menu mm
+ where mm.is_delete = 0
+ ORDER BY parent_id ASC,`order` ASC
+ 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>
+ from manage_menu mm
+ where mm.name like concat('%',#{name},'%')
+ and mm.is_delete = 0
+ limit #{start},#{number}
+ </select>
+
+ <select id="getManageMenuByRoleId" 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 mrm.is_delete = 0
+ JOIN manage_role mr
+ ON mr.id = mrm.role_id and mr.id = #{roleId}
+ WHERE mm.is_delete = 0
+ </select>
+
+ <select id="getManageMenuByCondition" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List"></include>
+ from manage_menu mm
+ where mm.is_delete = 0
+ <if test="name != null">
+ and mm.name = #{name}
+ </if>
+ <if test="url != null">
+ and mm.url = #{url}
+ </if>
+ <if test="icon != null">
+ and mm.icon = #{icon}
+ </if>
+ <if test="parent_id != null">
+ and mm.parent_id = #{parent_id}
+ </if>
+ <if test="order != null">
+ and mm.order = #{order}
+ </if>
+ <if test="desc != null">
+ and mm.desc = #{order}
+ </if>
+ limit #{start},#{number}
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0