|
|
@@ -97,9 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
select distinct r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly,
|
|
|
r.status, r.del_flag, r.create_time, r.remark,r.update_by,r.update_time
|
|
|
from sys_role r
|
|
|
- join sys_user_role ur on ur.role_id = r.role_id
|
|
|
- join sys_user u on u.id = ur.user_id
|
|
|
- join sys_dept d on u.dept_id = d.dept_id
|
|
|
+ left join sys_user_role ur on ur.role_id = r.role_id
|
|
|
+ left join sys_user u on u.id = ur.user_id
|
|
|
<where>
|
|
|
<if test="roleName != null and roleName != ''">
|
|
|
and r.role_name like concat('%', #{roleName}, '%')
|
|
|
@@ -143,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="status != null and status != ''">status,</if>
|
|
|
<if test="remark != null and remark != ''">remark,</if>
|
|
|
<if test="createBy != null and createBy != ''">create_by,</if>
|
|
|
+ <if test="updateBy != null and updateBy != ''">update_by,</if>
|
|
|
create_time
|
|
|
)values(
|
|
|
<if test="roleId != null and roleId != 0">#{roleId},</if>
|
|
|
@@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<if test="status != null and status != ''">#{status},</if>
|
|
|
<if test="remark != null and remark != ''">#{remark},</if>
|
|
|
<if test="createBy != null and createBy != ''">#{createBy},</if>
|
|
|
+ <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
|
|
|
sysdate()
|
|
|
)
|
|
|
</insert>
|
buzhanyi