java/zhihuishenqu.git

			@@ -17,7 +17,9 @@
			import com.panzhihua.common.model.vos.R;
			import com.panzhihua.common.model.vos.community.*;
			import com.panzhihua.common.model.vos.user.ComHouseMemberVo;
			import com.panzhihua.common.model.vos.user.ComMngFamilyInfoVO;
			import com.panzhihua.common.model.vos.user.InputUserInfoVO;
			import com.panzhihua.common.model.vos.user.UserElectronicFileVO;
			import com.panzhihua.service_community.dao.ComActDAO;
			import com.panzhihua.service_community.dao.ComActVillageDAO;
			import com.panzhihua.service_community.dao.ComMngPopulationDAO;
			@@ -31,6 +33,7 @@
			import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
			import org.springframework.stereotype.Service;
			import org.springframework.util.ObjectUtils;
			import org.springframework.util.StringUtils;

			import javax.annotation.Resource;
			import javax.crypto.BadPaddingException;
			@@ -129,11 +132,24 @@
			ComMngPopulationVO comMngPopulationVO = new ComMngPopulationVO();
			BeanUtils.copyProperties(comMngPopulationDO, comMngPopulationVO);

			//查询房屋成员信息
			//查询户主关系信息
			List<ComHouseMemberVo> comMngFamilyInfoVOS = populationDAO.listHouseMermberByUserId(comMngPopulationDO);
			if (!comMngFamilyInfoVOS.isEmpty()) {
			comMngPopulationVO.setComMngFamilyInfoVOS(comMngFamilyInfoVOS);
			}

			//查询当前用户电子档信息
			if(!StringUtils.isEmpty(comMngPopulationDO.getCardNo())){
			UserElectronicFileVO electronicFileVO = populationDAO.getSysUserElectronicFile(comMngPopulationDO.getCardNo());
			if(electronicFileVO != null){
			comMngPopulationVO.setUserElectronicFileVO(electronicFileVO);
			//查询家庭成员信息
			List<ComMngFamilyInfoVO> familyInfoVOList = populationDAO.listFamilyByUserId(electronicFileVO.getUserId());
			if(!familyInfoVOList.isEmpty()){
			comMngPopulationVO.setFamilyInfoVOList(familyInfoVOList);
			}
			}
			}
			return R.ok(comMngPopulationVO);
			}