Merge remote-tracking branch 'origin/master'

xuhy

2025-07-01 61f9d261edb521fc9d0f23c5f0a116dcd90c6b23

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TLeaveServiceImpl.java

@@ -86,7 +86,11 @@
        if (StringUtils.hasLength(query.getLeavePersonName())){
            List<Long> collect = sysUsers.stream().filter(e -> e.getNickName().contains(query.getLeavePersonName()))
                    .map(SysUser::getUserId).collect(Collectors.toList());
            if (collect.isEmpty()){
                collect.add(0L);
            }
            query.setUserIds(collect);

        }
        PageInfo<LeaveUserListVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<LeaveUserListVO> list = this.baseMapper.leaveList(query,pageInfo);