无关风月
3 天以前 25b569753afb9939e5610f6ba0d31a40f5e79388
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -639,6 +639,16 @@
    @Override
    public PageInfo<SysUserVO> pageList(SysUserQuery query) {
        if (org.springframework.util.StringUtils.hasLength(query.getRoleName())){
            List<SysRole> sysRoles = roleMapper.selectRoleAll();
            List<Long> roleIds = sysRoles.stream().filter(e -> e.getRoleName().contains(query.getRoleName()))
                    .map(SysRole::getRoleId).collect(Collectors.toList());
            if (roleIds.isEmpty()){
                return new PageInfo<>();
            }
            query.setRoleIds(roleIds);
        }
        PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<SysUserVO> list = userMapper.pageList(query,pageInfo);
        if(CollectionUtils.isEmpty(list)){