lidongdong
2023-08-24 8c0b5b30e5200e7bd45aa34507c3623e17fcce91
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -32,7 +32,12 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.util.*;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.panzhihua.common.utlis.PayUtil.makeUUID;
/**
 * @auther lyq
@@ -760,8 +765,7 @@
    @Override
    public R detailNeighborByAdmin(Long id) {
        ComActNeighborCircleDetailAppVO comActNeighborCircleDO =
                this.baseMapper.neighborDetailByApp(id);
        ComActNeighborCircleDetailAppVO comActNeighborCircleDO = baseMapper.neighborDetailByApp(id);
        if (comActNeighborCircleDO == null) {
            return R.fail("id有误");
        }
@@ -789,7 +793,11 @@
        if (comActNeighborCircleDO.getTopicId() != null) {
            ComActNeighborCircleTopicDO circleTopicDO =
                comActNeighborCircleTopicMapper.selectById(comActNeighborCircleDO.getTopicId());
            vo.setTopicName(circleTopicDO.getName());
            if(circleTopicDO!=null && !StringUtils.isEmpty(circleTopicDO.getName()))
            {
                vo.setTopicName(circleTopicDO.getName());
            }
        }
        return R.ok(vo);
    }