From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/resources/mapper/RoleMapper.xml | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/dao/src/main/resources/mapper/RoleMapper.xml b/dao/src/main/resources/mapper/RoleMapper.xml
index edff028..5580a01 100644
--- a/dao/src/main/resources/mapper/RoleMapper.xml
+++ b/dao/src/main/resources/mapper/RoleMapper.xml
@@ -5,18 +5,35 @@
<mapper namespace="com.sandu.ximon.dao.mapper.RoleMapper">
<resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.Role">
- <id property="id" column="id" jdbcType="BIGINT"/>
- <result property="name" column="name" jdbcType="VARCHAR"/>
- <result property="remark" column="remark" jdbcType="VARCHAR"/>
- <result property="level" column="level" jdbcType="INTEGER"/>
- <result property="permission" column="permission" jdbcType="VARCHAR"/>
- <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
- <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="remark" column="remark" jdbcType="VARCHAR"/>
+ <result property="level" column="level" jdbcType="INTEGER"/>
+ <result property="permission" column="permission" jdbcType="VARCHAR"/>
+ <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
+ <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
</resultMap>
- <sql id="Base_Column_List">
- id,name,remark,
- level,permission,create_time,
- update_time
- </sql>
+ <resultMap id="RoleDetail" type="com.sandu.ximon.dao.domain.RoleDetail" extends="BaseResultMap">
+ <collection property="menuIdList" columnPrefix="menu_" ofType="java.lang.Long">
+ <constructor>
+ <arg column="menu_id" javaType="long"/>
+ </constructor>
+
+ </collection>
+ </resultMap>
+
+
+ <select id="listRole" resultMap="RoleDetail">
+ SELECT t1.*,
+ t2.menu_id AS menu_menu_id
+ FROM role t1
+ LEFT JOIN role_menu_relation t2 ON t1.id = t2.role_id
+ <where>
+ t1.id IN
+ <foreach collection="roleIdList" separator="," item="roleId" open="(" close=")">
+ #{roleId}
+ </foreach>
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3