101captain
2022-08-01 bf46bac3cda70dc8dc7ed95e0461f1a72fba2eeb
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -10,6 +10,7 @@
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.PageVO;
import com.panzhihua.common.service.user.UserService;
import com.panzhihua.common.utlis.SensitiveUtil;
import com.panzhihua.service_community.entity.ComPbCheckUnit;
import com.panzhihua.service_community.service.ComActNeighborCircleTopicService;
import org.apache.commons.lang3.ObjectUtils;
@@ -242,7 +243,7 @@
        if(circleDetailAppVO.getOrderType()!=null){
            if(circleDetailAppVO.getOrderType()==2){
                AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
                circleDetailAppVO.setSolveName(user1.getName());
                circleDetailAppVO.setSolveName(SensitiveUtil.replaceName(user1.getName()));
            }
            if(circleDetailAppVO.getOrderType()==1){
                ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
@@ -267,7 +268,12 @@
                circleDetailAppVO.setHaveSign(2);
            }
        }
        ComActActivityDO comActActivityDO=comActActivityDAO.selectOne(new QueryWrapper<ComActActivityDO>().lambda().eq(ComActActivityDO::getRelationId,neighborCircleAppDTO.getCircleId()));
        if(comActActivityDO!=null){
            circleDetailAppVO.setActivityDate(comActActivityDO.getCreateAt());
            circleDetailAppVO.setActivityId(comActActivityDO.getId());
            circleDetailAppVO.setActivityName(comActActivityDO.getActivityName());
        }
        // 查询邻里圈下评论列表
        IPage<ComActNeighborCircleCommentAppVO> circleCommentAppPage =
            comActNeighborCircleCommentDAO.pageNeighborCommentByApp(
@@ -1190,6 +1196,11 @@
        return null;
    }
    @Override
    public R selectCount(Integer type, String phone) {
        return R.ok(this.baseMapper.selectCount(type,phone));
    }
    /**
     * 判断活动统计列表中是否已有该单位的数据
     * */