|
6 | 6 | <result column="id" property="id"/> |
7 | 7 | <result column="code" property="code"/> |
8 | 8 | <result column="name" property="name"/> |
| 9 | + <result column="type" property="type"/> |
9 | 10 | <result column="description" property="description"/> |
10 | 11 | <result column="create_time" property="createTime"/> |
11 | 12 | <result column="update_time" property="updateTime"/> |
|
50 | 51 | </if> |
51 | 52 | </select> |
52 | 53 | <select id="selectUnionVo" resultMap="SysRoleUnionVoMap"> |
53 | | - SELECT sr.id, sr.code, sr.name, sr.description, sr.create_time, sr.update_time, sr.update_user, |
| 54 | + SELECT sr.id, sr.code, sr.name, sr.type, sr.description, sr.create_time, sr.update_time, sr.update_user, |
54 | 55 | JSON_ARRAYAGG(sm.id) m_id, JSON_ARRAYAGG(sa.id) a_id |
55 | 56 | FROM sys_role sr |
56 | 57 | LEFT JOIN sys_role_menu srm ON srm.role_id = sr.id |
|
70 | 71 | AND sr.type = #{req.type.prefix} |
71 | 72 | </where> |
72 | 73 | </if> |
73 | | - GROUP BY sr.id, sr.code, sr.name, sr.description, sr.create_time, sr.update_time, sr.update_user |
| 74 | + GROUP BY sr.id, sr.code, sr.name, sr.type, sr.description, sr.create_time, sr.update_time, sr.update_user |
74 | 75 | ORDER BY sr.code |
75 | 76 | </select> |
76 | 77 | <select id="selectUnionVoByRoleIds" resultMap="SysRoleUnionVoMap"> |
77 | | - SELECT sr.id, sr.code, sr.name, sr.description, sr.create_time, sr.update_time, sr.update_user, |
| 78 | + SELECT sr.id, sr.code, sr.name, sr.type, sr.description, sr.create_time, sr.update_time, sr.update_user, |
78 | 79 | JSON_ARRAYAGG(sm.id) m_id, JSON_ARRAYAGG(sa.id) a_id |
79 | 80 | FROM sys_role sr |
80 | 81 | LEFT JOIN sys_role_menu srm ON srm.role_id = sr.id |
|
88 | 89 | </foreach> |
89 | 90 | ) |
90 | 91 | </if> |
91 | | - GROUP BY sr.id, sr.code, sr.name, sr.description, sr.create_time, sr.update_time, sr.update_user |
| 92 | + GROUP BY sr.id, sr.code, sr.name, sr.type, sr.description, sr.create_time, sr.update_time, sr.update_user |
92 | 93 | ORDER BY sr.code |
93 | 94 | </select> |
94 | 95 | <delete id="deleteRoleUserByUserIds"> |
|
0 commit comments