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

lidongdong

2022-10-24 bd927f5c9f26d5ae89a272e56a4b3bd655bd148f

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

@@ -9,6 +9,7 @@

import javax.annotation.Resource;

import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdcardUtil;
import com.google.common.collect.Lists;
import com.panzhihua.common.enums.ComPbMemberRoleTypeEnum;
@@ -72,6 +73,8 @@
    private CommunityWestService communityWestService;
    @Resource
    private UserService userService;
    @Resource
    private ComPbMemberDAO comPbMemberDAO;

    /**
     * 新增党员
@@ -554,6 +557,15 @@
        }
        page.setSize(pageSize);
        page.setCurrent(pageNum);
        Long communityId = partyBuildingComPbDynVO.getCommunityId();
        if (null != communityId){
            List<Long> communityIds = comPbMemberDAO.selectIds(communityId);
            if (CollUtil.isEmpty(communityIds)) {
                communityIds = new ArrayList<>();
                communityIds.add(communityId);
            }
            partyBuildingComPbDynVO.setCommunityIds(communityIds);
        }
        IPage<PartyBuildingComPbDynVO> iPage = comPbDynDAO.pageYnamic(page, partyBuildingComPbDynVO);
        List<PartyBuildingComPbDynVO> records = iPage.getRecords();
        if (!(ObjectUtils.isEmpty(records))) {