Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into ...

101captain

2021-09-30 09c6af7d0c851b366e1ccd4685351c7dba667763

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

@@ -35,6 +35,7 @@
import org.springframework.util.ObjectUtils;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;

@@ -70,7 +71,15 @@
    public R insert(ComActFourMemberVO comActFourMemberVO) {
        if(comActFourMemberVO!=null&&comActFourMemberVO.getJurisdiction()!=null){
            ComActFourMember comActFourMember=new ComActFourMember();
            List<String> jurisdictionList=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
            List<String> jurisdictionList=new ArrayList<>();
            List<String> jurisdictionList1=comMngBuildingDAO.find(comActFourMemberVO.getJurisdiction());
            List<String> jurisdictionList2=comMngBuildingDAO.findByVillage(comActFourMemberVO.getJurisdiction());
            if(!jurisdictionList1.isEmpty()){
                jurisdictionList.addAll(jurisdictionList1);
            }
            if(!jurisdictionList2.isEmpty()){
                jurisdictionList.addAll(jurisdictionList2);
            }
            if(!jurisdictionList.isEmpty()&&jurisdictionList.size()==jurisdictionList.stream().distinct().collect(Collectors.toList()).size()){
                comActFourMember.setJurisdictionContent(JSON.toJSONString(jurisdictionList));
                AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();