Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

张天森

2022-07-08 c640b18fae716de628b2a2b4d43f6869f3ab83ff

Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

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

@@ -238,6 +238,7 @@
                circleDetailAppVO.setName(actDO.getName());
            }
        }
        if(circleDetailAppVO.getOrderType()!=null){
        if(circleDetailAppVO.getOrderType()==2){
            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
            circleDetailAppVO.setSolveName(user1.getName());
@@ -246,6 +247,7 @@
            ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
            if(comPbCheckUnit!=null){
                circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
                }
            }
        }

@@ -723,6 +725,7 @@
        BeanUtils.copyProperties(comActNeighborCircleDO, vo);
        vo.setReleaseName(user.getName());
        vo.setImageUrl(user.getImageUrl());
        if(comActNeighborCircleDO.getOrderType()!=null){
        if(comActNeighborCircleDO.getOrderType()==2){
            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
            vo.setSolveName(user1.getName());
@@ -733,6 +736,7 @@
                vo.setSolveName(comPbCheckUnit.getName());
            }
        }
        }

        // 查询话题名称
        if (comActNeighborCircleDO.getTopicId() != null) {