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

Merge branch 'master' of https://gitee.com/youlaiorg/youlai-boot

Browse Source 
# Conflicts:
#	src/main/java/com/youlai/boot/system/model/query/UserPageQuery.java
This commit is contained in:
Kang_Yang
2024-10-17 10:59:31 +08:00
parent e22a91be4e 2aa8ea4544
commit 908335a7b5
5 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,12 @@
<if test='queryParams.deptId!=null'>
AND concat(',',concat(d.tree_path,',',d.id),',') like concat('%,',#{queryParams.deptId},',%')
</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[0] != null and queryParams.createTime[0] != ''">
<bind name="startDate" value="queryParams.createTime[0].length() == 10 ? queryParams.createTime[0] + ' 00:00:00' : queryParams.createTime[0]"/>