java/zhihuishenqu.git

			@@ -12,10 +12,7 @@
			import com.panzhihua.common.enums.PopulRelationEnum;
			import com.panzhihua.common.model.dtos.property.CommonPage;
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.ComActFourMemberVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
			import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
			import com.panzhihua.common.model.vos.community.FourMemberDetailVO;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.partybuilding.ComPbMemberVO;
			import com.panzhihua.common.model.vos.user.AdministratorsUserVO;
			import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
			@@ -38,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;

			@@ -73,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();
			@@ -205,7 +211,7 @@
			// comMngPopulationDO.setAge(AgeUtils.getAgeFromBirthTimes(comMngPopulationDO.getBirthday()));
			// }

			ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
			ComMngPopulationNoSecretVO comMngPopulationVO = new ComMngPopulationNoSecretVO();
			BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

			// 查询户主关系信息