修改路北社区 活动发布 报名时间问题

lidongdong

2023-12-13 6aeed3a91b3bca658fc8dbb0f8642712e484d77d

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

@@ -765,7 +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有误");
        }
@@ -793,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);
    }
@@ -1187,8 +1191,13 @@
                        }else {
                            //新数据，获取单位，社区名
                            vo.setUnitName(comActDAO.selectUnitName(vo.getUnitId()));
                            if (ObjectUtils.isNotEmpty(vo.getCommunityId())) {
                                vo.setCommunityName(comActDAO.selectById(vo.getCommunityId()).getName());
                            if (ObjectUtils.isNotEmpty(vo.getCommunityId()))
                            {
                                ComActDO actDO=comActDAO.selectById(vo.getCommunityId());
                                if(actDO!=null && !StringUtils.isEmpty(actDO.getName()))
                                {
                                    vo.setCommunityName(actDO.getName());
                                }
                            }
                            unitActivityAnalysisVOS.add(vo);
                        }