Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-21 12fc808332a67c59a4e1c849c8c2b20df6801f18

Merge branch 'local_20221014' into huacheng_test

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/ComPbCheckUnitApi.java

@@ -85,6 +85,10 @@
        if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){
            comPbCheckUnit.setBelongTo(this.getLoginUserInfo().getName());
        }
        Long communityId = comPbCheckUnit.getCommunityId();
        if (null!= communityId && communityId == 0L){
            comPbCheckUnit.setCommunityId(null);
        }
        if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){
            comPbCheckUnit.setId(this.getLoginUserInfo().getBindingCheckUnitId());
        }

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java

@@ -300,6 +300,10 @@
        if(ArrayUtil.contains(area,this.getLoginUserInfo().getName())){
            pagePartyOrganizationVO.setBelongTo(this.getLoginUserInfo().getName());
        }
        Long communityId = pagePartyOrganizationVO.getCommunityId();
        if (null!= communityId && communityId == 0L){
            pagePartyOrganizationVO.setCommunityId(null);
        }
        if(this.getLoginUserInfo().getBindingCheckUnitId()!=null){
            pagePartyOrganizationVO.setCheckUnitId(this.getLoginUserInfo().getBindingCheckUnitId());
        }

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

@@ -102,12 +102,14 @@
//            }
//        }
        Long communityId = neighborCircleAppDTO.getCommunityId();
        List<Long> communityIds = comActDAO.selectIds(communityId);
        if (CollUtil.isEmpty(communityIds)) {
            communityIds = new ArrayList<>();
            communityIds.add(communityId);
        if(null != communityId){
            List<Long> communityIds = comActDAO.selectIds(communityId);
            if (CollUtil.isEmpty(communityIds)) {
                communityIds = new ArrayList<>();
                communityIds.add(communityId);
            }
            neighborCircleAppDTO.setCommunityIds(communityIds);
        }
        neighborCircleAppDTO.setCommunityIds(communityIds);
        Page userPage = new Page(neighborCircleAppDTO.getPageNum(), neighborCircleAppDTO.getPageSize());
        IPage<ComActNeighborCircleAppVO> doPager = this.baseMapper.pageNeighborByApp(userPage, neighborCircleAppDTO);
        if (!doPager.getRecords().isEmpty()) {
@@ -343,13 +345,14 @@
    @Override
    public R pageNeighborByAdmin(ComActNeighborCircleAdminDTO neighborCircleAdminDTO) {
        Long communityId = neighborCircleAdminDTO.getCommunityId();
        List<Long> communityIds = comActDAO.selectIds(communityId);
        if (CollUtil.isEmpty(communityIds)) {
            communityIds = new ArrayList<>();
            communityIds.add(communityId);
        if(null != communityId){
            List<Long> communityIds = comActDAO.selectIds(communityId);
            if (CollUtil.isEmpty(communityIds)) {
                communityIds = new ArrayList<>();
                communityIds.add(communityId);
            }
            neighborCircleAdminDTO.setCommunityIds(communityIds);
        }
        neighborCircleAdminDTO.setCommunityIds(communityIds);

        Page page = new Page(neighborCircleAdminDTO.getPageNum(), neighborCircleAdminDTO.getPageSize());
        IPage<ComActNeighborCircleAdminVO> doPager = this.baseMapper.pageNeighborByAdmin(page, neighborCircleAdminDTO);
        doPager.getRecords().forEach(data -> {