tongtong/youlai-boot
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 用户查询中排除超级管理员并优化重复条件

Browse Source
This commit is contained in:
Ray.Hao
2025-03-06 16:51:42 +08:00
parent 129e2153d9
commit 1919395967
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/mapper/system/UserMapper.xml
View File

@@ -26,7 +26,7 @@
<where> <where>
u.is_deleted = 0 u.is_deleted = 0
<!-- 超级管理员不显示在列表 --> <!-- 超级管理员不显示在列表 -->
AND r.name != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}' AND r.code != '${@com.youlai.boot.common.constant.SystemConstants@ROOT_ROLE_CODE}'
<if test='queryParams.keywords!=null and queryParams.keywords.trim() neq ""'> <if test='queryParams.keywords!=null and queryParams.keywords.trim() neq ""'>
AND ( AND (
u.username LIKE CONCAT('%',#{queryParams.keywords},'%') u.username LIKE CONCAT('%',#{queryParams.keywords},'%')
@@ -40,12 +40,6 @@
<if test='queryParams.deptId!=null'> <if test='queryParams.deptId!=null'>
AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%') AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
</if> </if>
<if test='queryParams.roleIds!=null and queryParams.roleIds.size > 0'>
AND sur.role_id in
<foreach collection="queryParams.roleIds" item="roleId" open="(" close=")" separator=",">
#{roleId}
</foreach>
</if>
<if test="queryParams.createTime != null and queryParams.createTime.size > 0"> <if test="queryParams.createTime != null and queryParams.createTime.size > 0">
<if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''"> <if test="queryParams.createTime[0] != null and queryParams.createTime[0] != ''">
<bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/> <bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>