|
@@ -115,7 +115,7 @@ public class SysUserServiceImpl implements ISysUserService {
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
|
|
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
|
|
- Long userId = userRoleMapper.selectUserIdByRoleId(user.getRoleId());
|
|
|
|
|
|
+ List<Long> userId = userRoleMapper.selectUserIdsByRoleId(user.getRoleId());
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
QueryWrapper<SysUser> wrapper = Wrappers.query();
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
|
|
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|
|
.and(w -> w.ne("r.role_id", user.getRoleId()).or().isNull("r.role_id"))
|