From 90e19d2fb94818ece611e883cff4b3c7388e1c33 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 23 十一月 2021 18:04:08 +0800
Subject: [PATCH] 1123死亡管理相关功能提交

---
 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
index b380ddf..47d8e12 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -97,7 +97,17 @@
             if (!ObjectUtils.isEmpty(data)) {
                 LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
                 R r1 = communityService.detailHouse(userId);
-//                R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+                if(StringUtils.isNotEmpty(loginUserInfoVO.getIdCard())){
+                    //查询实名用户绑定的实有人口地址
+                    R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
+                    if(R.isOk(r4)){
+                        String address= (String) r4.getData();
+                        if(StringUtils.isNotEmpty(address)){
+                            loginUserInfoVO.setAddress(address);
+                            r.setData(loginUserInfoVO);
+                        }
+                    }
+                }
                 if (null != communityId && 0 != communityId) {
                     R r2 = communityService.detailCommunity(communityId);
                     if (R.isOk(r2)) {
@@ -127,13 +137,6 @@
                         r.setData(loginUserInfoVO);
                     }
                 }
-//                if(R.isOk(r4)){
-//                    String address= (String) r4.getData();
-//                    if(StringUtils.isNotEmpty(address)){
-//                        loginUserInfoVO.setAddress(address);
-//                        r.setData(loginUserInfoVO);
-//                    }
-//                }
             }
         }
         return r;

--
Gitblit v1.7.1