商业街bug修改

puhanshu

2022-01-14 51ee3c4db2eb49062d3236bf44f95dc22f8f6ac9

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java

@@ -139,7 +139,7 @@
                circleTopicDO.setName(addNeighborCircleAppDTO.getTopicName());
                circleTopicDO.setCreateBy(neighborCircleDO.getReleaseId());
                circleTopicDO.setCreateAt(new Date());
                circleTopicDO.setCount(1);
                circleTopicDO.setCount(0);
                circleTopicDO.setHotNum(0L);
                circleTopicDO.setStatus(ComActNeighborCircleTopicDO.status.yes);
                comActNeighborCircleTopicMapper.insert(circleTopicDO);
@@ -275,8 +275,10 @@
        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {
            if (data.getUserType() != 1) {
                data.setReleaseName(data.getCommunityName());
            if(data.getUserType()!=null){
                if (data.getUserType() != 1) {
                    data.setReleaseName(data.getCommunityName());
                }
            }
        });
        return R.ok(doPager);
@@ -663,6 +665,7 @@
        DetailNeighborCircleAdminVO vo = new DetailNeighborCircleAdminVO();
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());

        // 查询话题名称
        if (comActNeighborCircleDO.getTopicId() != null) {
@@ -719,6 +722,7 @@
        BeanUtils.copyProperties(commentDO, vo);
        String name = user.getName() == null ? user.getNickName() : user.getName();
        vo.setUserName(name);
        vo.setUserPhone(user.getPhone());
        return R.ok(vo);
    }