修改四长四员相关功能

101captain

2021-09-30 96045ec223a816bdd5e73e6bf62bcb8feee5ff50

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

@@ -64,7 +64,15 @@
    private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
    @Override
    public R pageList(CommonPage commonPage) {
        return R.ok(comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
        IPage<ComActFourMemberVO> comActFourMemberVOIPage=comActFourMemberDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage);
        if(!comActFourMemberVOIPage.getRecords().isEmpty()){
            comActFourMemberVOIPage.getRecords().forEach(comActFourMemberVO -> {
                if(comActFourMemberVO.getJurisdictionContent()!=null){
                    comActFourMemberVO.setJurisdictionContentList(JSON.parseArray(comActFourMemberVO.getJurisdictionContent(),String.class));
                }
            });
        }
        return R.ok(comActFourMemberVOIPage);
    }

    @Override
@@ -81,7 +89,6 @@
                jurisdictionList.addAll(jurisdictionList2);
            }
            if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
                comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
                BeanUtils.copyProperties(comActFourMemberVO,administratorsUserVO);
                administratorsUserVO.setType(3);
@@ -90,6 +97,7 @@
                    comActFourMemberVO.setUserId(Long.parseLong(r.getData().toString()));
                    comActFourMemberVO.setCreateTime(DateUtil.date());
                    BeanUtils.copyProperties(comActFourMemberVO,comActFourMember);
                    comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                    this.comActFourMemberDao.insert(comActFourMember);
                    return R.ok();
                }