DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增禁用用户不被考勤页面检索

Browse Source
This commit is contained in:
86156
2025-12-01 16:55:07 +08:00
parent 42c9b11992
commit 789a6e17e4
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
View File

@@ -75,7 +75,6 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
@Override @Override
public TableDataInfo<SysUser> selectUserListByRoleId(SysUser user, PageQuery pageQuery) { public TableDataInfo<SysUser> selectUserListByRoleId(SysUser user, PageQuery pageQuery) {
QueryWrapper<SysUser> sysUserWrapper = this.buildQueryWrapper(user); QueryWrapper<SysUser> sysUserWrapper = this.buildQueryWrapper(user);
sysUserWrapper.eq("u.status",0);
sysUserWrapper.eq("sr.role_id", 1852970465740505090L); sysUserWrapper.eq("sr.role_id", 1852970465740505090L);
Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), sysUserWrapper); Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), sysUserWrapper);
return TableDataInfo.build(page); return TableDataInfo.build(page);

2
ruoyi-system/src/main/resources/mapper/system/SysUserRoleMapper.xml
View File

@@ -20,7 +20,7 @@
on u.user_id = sur.user_id and sur.role_id != #{roleId} on u.user_id = sur.user_id and sur.role_id != #{roleId}
</select> </select>
<select id="selectUserIdsByNotRoleId" resultType="java.lang.Long"> <select id="selectUserIdsByRoleIdAndEnable" resultType="java.lang.Long">
select u.user_id from sys_user u select u.user_id from sys_user u
inner join sys_user_role sur inner join sys_user_role sur
on u.user_id = sur.user_id and sur.role_id != #{roleId} on u.user_id = sur.user_id and sur.role_id != #{roleId}