From d3a3ad5cbd15a54d41e98ef12344fa9ff88ce635 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 04 三月 2022 11:45:38 +0800 Subject: [PATCH] update 简化查询用户功能 --- ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml | 46 +++++----------------------------------------- 1 files changed, 5 insertions(+), 41 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 5440f4f..dc54c7e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -39,50 +39,14 @@ left join sys_dept d on u.dept_id = d.dept_id </sql> - <select id="selectPageRoleList" parameterType="SysRole" resultMap="SysRoleResult"> + <select id="selectPageRoleList" resultMap="SysRoleResult"> <include refid="selectRoleVo"/> - where r.del_flag = '0' - <if test="role.roleName != null and role.roleName != ''"> - AND r.role_name like concat('%', #{role.roleName}, '%') - </if> - <if test="role.status != null and role.status != ''"> - AND r.status = #{role.status} - </if> - <if test="role.roleKey != null and role.roleKey != ''"> - AND r.role_key like concat('%', #{role.roleKey}, '%') - </if> - <if test="role.params.beginTime != null and role.params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� --> - and date_format(r.create_time,'%y%m%d') >= date_format(#{role.params.beginTime},'%y%m%d') - </if> - <if test="role.params.endTime != null and role.params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� --> - and date_format(r.create_time,'%y%m%d') <= date_format(#{role.params.endTime},'%y%m%d') - </if> - <!-- 鏁版嵁鑼冨洿杩囨护 --> - ${role.params.dataScope} - order by r.role_sort + ${ew.getCustomSqlSegment} </select> - <select id="selectRoleList" parameterType="SysRole" resultMap="SysRoleResult"> + <select id="selectRoleList" resultMap="SysRoleResult"> <include refid="selectRoleVo"/> - where r.del_flag = '0' - <if test="roleName != null and roleName != ''"> - AND r.role_name like concat('%', #{roleName}, '%') - </if> - <if test="status != null and status != ''"> - AND r.status = #{status} - </if> - <if test="roleKey != null and roleKey != ''"> - AND r.role_key like concat('%', #{roleKey}, '%') - </if> - <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� --> - and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - </if> - <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� --> - and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') - </if> - <!-- 鏁版嵁鑼冨洿杩囨护 --> - ${params.dataScope} - order by r.role_sort + ${ew.getCustomSqlSegment} </select> <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult"> @@ -90,7 +54,7 @@ WHERE r.del_flag = '0' and ur.user_id = #{userId} </select> - <select id="selectRoleListByUserId" parameterType="Long" resultType="Integer"> + <select id="selectRoleListByUserId" parameterType="Long" resultType="Long"> select r.role_id from sys_role r left join sys_user_role ur on ur.role_id = r.role_id -- Gitblit v1.9.3