Merge remote-tracking branch 'origin/master'

CeDo

2021-04-12 c3ce38cb41d4e4a7d036576b7be52ec2d8c3e724

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -49,6 +49,7 @@
    @Resource
    private ComPbMemberDAO comPbMemberDAO;


    /**
     * 查询某个党员加入的所有党员活动
     *
@@ -158,6 +159,12 @@
        partyBuildingActivityVO.setPartyBuildingMemberVOS(partyBuildingMemberVOS);
        partyBuildingActivityVO.setIsPerson(isPerson);
        partyBuildingActivityVO.setCreateByName(loginUserInfoVO.getName());

        //查询社区名称
        if(partyBuildingActivityVO.getCommunityId() != null){
            partyBuildingActivityVO.setCommunityName(comBpActivityDAO.selectCommunityNameByCommunityId(partyBuildingActivityVO.getCommunityId()));
        }

        return R.ok(partyBuildingActivityVO);
    }