Merge branch 'bugfix/teamB_shuangshi'

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/MyResiUserInfoResultDTO.java

@@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 类别【字典表】
      */
     private String volunteerCategory;
+
+    /**
+     * 是否显示我的家庭
+     */
+    private Boolean homeFlag;
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MyResiUserInfoResultDTO.java

@@ -66,4 +66,9 @@ public class MyResiUserInfoResultDTO implements Serializable {
      * 类别【字典表】
      */
     private String volunteerCategory;
+
+    /**
+     * 是否显示我的家庭
+     */
+    private Boolean homeFlag;
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java

@@ -213,6 +213,17 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             MyResiUserInfoResultDTO result = ConvertUtils.sourceToTarget(myselfMsg, MyResiUserInfoResultDTO.class);
             //registerFlag 是否已注册居民，true ,false
             result.setRegisterFlag(StringUtils.isNotBlank(myselfMsg.getResiId()));
+            if(StringUtils.isNotBlank(myselfMsg.getIdNum()) && StringUtils.isNotBlank(myselfMsg.getResiId())){
+                //找到该身份证号的居民
+                IcResiUserDTO icResiUserDTO = icResiUserService.getByIdCard(myResiUserInfoFormDTO.getCustomerId(), myselfMsg.getIdNum(), null);
+                if(null != icResiUserDTO && "0".equals(icResiUserDTO.getStatus())){
+                    result.setHomeFlag(true);
+                }else{
+                    result.setHomeFlag(false);
+                }
+            }else{
+                result.setHomeFlag(false);
+            }
             // 已录入身份证号：true;未完善：false.
             result.setCompleteIdNum(StringUtils.isNotBlank(myselfMsg.getIdNum()));
             result.setRegisterGridName(ModuleConstant.EMPTY_STR);