101captain
2022-07-08 ce34fb4b611a61885c7146e8d776c758b3f366fe
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActNeighborCircleServiceImpl.java
@@ -238,6 +238,16 @@
                circleDetailAppVO.setName(actDO.getName());
            }
        }
        if(circleDetailAppVO.getSolveId()!=null){
            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(circleDetailAppVO.getSolveId());
            circleDetailAppVO.setSolveName(user1.getName());
        }
        if(circleDetailAppVO.getSolveUnitId()!=null){
            ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(circleDetailAppVO.getSolveUnitId());
            if(comPbCheckUnit!=null){
                circleDetailAppVO.setSolveName(comPbCheckUnit.getName());
            }
        }
        if (neighborCircleAppDTO.getUserId() != null) {
            // 查询邻里圈点赞信息
@@ -715,12 +725,12 @@
        vo.setImageUrl(user.getImageUrl());
        if(comActNeighborCircleDO.getSolveId()!=null){
            AdministratorsUserVO user1 = this.baseMapper.selectUserByUserId(comActNeighborCircleDO.getSolveId());
            comActNeighborCircleDO.setSolveName(user1.getName());
            vo.setSolveName(user1.getName());
        }
        if(comActNeighborCircleDO.getSolveUnitId()!=null){
            ComPbCheckUnit comPbCheckUnit=comPbCheckUnitDao.selectById(comActNeighborCircleDO.getSolveUnitId());
            if(comPbCheckUnit!=null){
                comActNeighborCircleDO.setSolveName(comPbCheckUnit.getName());
                vo.setSolveName(comPbCheckUnit.getName());
            }
        }
@@ -1015,7 +1025,7 @@
            ComPbMemberDO comPbMemberDO=comPbMemberDAO.selectOne(new QueryWrapper<ComPbMemberDO>().lambda().eq(ComPbMemberDO::getPhone,serviceStaticDTO.getPhone()).last("limit 1"));
            if(comPbMemberDO!=null){
                serviceStaticsVO.setWorkActivityList(comActActivityDAO.selectListByRelationId(comPbMemberDO.getCheckUnitId(),serviceStaticDTO.getYear()));
                serviceStaticsVO.setServiceActivityList(comActActivityDAO.selectListByCommunityId(comPbMemberDO.getCommunityId(),serviceStaticDTO.getYear()));
                serviceStaticsVO.setServiceActivityList(comActActivityDAO.selectListByCommunityId(comPbMemberDO.getCommunityId(),serviceStaticDTO.getYear(),serviceStaticDTO.getPhone()));
            }
        }