bug修复

huanghongfa

2021-09-30 63d368fffeb8872e9528f56cf6dfb35fa4f50f80

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

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

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

        // 查询户主关系信息
@@ -243,9 +240,9 @@
            comMngPopulationVO.setHouseList(houseList);
        }

        if(comMngPopulationVO!=null&&StringUtils.isNotEmpty(comMngPopulationVO.getPhone())){
        if(comMngPopulationVO!=null&&StringUtils.isNotEmpty(comMngPopulationVO.getCardNoStr())){
            fourMemberDetailVO.setComMngPopulationVO(comMngPopulationVO);
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getPhone());
            ComPbMemberVO comPbMemberDO=comPbMemberDAO.selectById(comMngPopulationVO.getCardNoStr());
            if(comPbMemberDO!=null){
                fourMemberDetailVO.setPartyBuildingMemberVO(comPbMemberDO);
            }