From 438e0309b09a70224d6e5be0d60ac5b52aa6df48 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期四, 30 九月 2021 09:34:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
index 0289a4a..94918a2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java
+++ b/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);
}
--
Gitblit v1.7.1