fix: 群消息查询

wl

2022-12-26 382c9fa680114b16e5b6f1fef834f4be3268cd35

fix: 群消息查询

 src/main/java/com/example/jz/service/impl/GroupServiceImpl.java

@@ -66,7 +66,7 @@
                pic = report.getPic();
                Message message = new Message();
                message.setReportName(username);
                messageDao.update(message,new QueryWrapper<Message>().eq("user_id",item.getUserId()));
                messageDao.update(message, new QueryWrapper<Message>().eq("user_id", item.getUserId()));
            }
            GroupMessageVo groupMessageVo = new GroupMessageVo();
            groupMessageVo.setUserName(username);
@@ -80,7 +80,7 @@

    @Override
    public List<Announcement> getAllNotice(Integer id) {
        return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id).eq(Announcement::getStatus,1));
        return announcementDao.selectList(new LambdaQueryWrapper<>(Announcement.class).eq(Announcement::getGroupId, id).eq(Announcement::getStatus, 1));
    }

    @Override
@@ -96,37 +96,17 @@
    }

    @Override
    public List<GroupMessageVo> getByCondition(String name, String text,Integer groupId) {
        List<GroupMessageVo> groupUserVoList;
        if (StringUtils.isBlank(name)) {
          groupUserVoList = messageDao.selectList(new QueryWrapper<Message>().like(StringUtils.isNotBlank(text), "text", text).eq("group_id",groupId).orderByAsc("ctime")).stream().map(item -> {
                String username;
                String pic = null;
                if (item.getUserId() == null) {
                    username = userDao.selectOne(new QueryWrapper<User>().eq("cop_id", item.getCopId())).getRealName();
                } else {
    public List<GroupMessageVo> getByCondition(String name, String text, Integer groupId) {
        return messageDao.selectList(new QueryWrapper<Message>().like(StringUtils.isNotBlank(text), "text", text).eq(StringUtils.isNotBlank(name),"report_name",name).eq("group_id", groupId).orderByAsc("ctime")).stream()
                .filter(item -> item.getUserId() != null)
                .map(item -> {
                    Report report = reportDao.selectOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
                    username = userDao.selectOne(new QueryWrapper<User>().eq("id", report.getUserId())).getRealName();
                    pic = report.getPic();
                }
                GroupMessageVo groupMessageVo = new GroupMessageVo();
                groupMessageVo.setUserName(username);
                groupMessageVo.setText(item.getText());
                groupMessageVo.setCtime(item.getCtime());
                groupMessageVo.setPic(pic);
                return groupMessageVo;
            }).collect(Collectors.toList());
        } else {
             groupUserVoList = messageDao.selectList(new QueryWrapper<Message>().eq("report_Name", name).eq("group_id",groupId).orderByAsc("ctime")).stream().map(item -> {
                Report report = reportDao.selectOne(new QueryWrapper<Report>().eq("id", item.getUserId()));
                GroupMessageVo groupMessageVo = new GroupMessageVo();
                groupMessageVo.setUserName(item.getReportName());
                groupMessageVo.setText(item.getText());
                groupMessageVo.setCtime(item.getCtime());
                groupMessageVo.setPic(report.getPic());
                return groupMessageVo;
            }).collect(Collectors.toList());
        }
        return groupUserVoList;
                    GroupMessageVo groupMessageVo = new GroupMessageVo();
                    groupMessageVo.setUserName(item.getReportName());
                    groupMessageVo.setText(item.getText());
                    groupMessageVo.setCtime(item.getCtime());
                    groupMessageVo.setPic(report.getPic());
                    return groupMessageVo;
                }).collect(Collectors.toList());
    }
}