From d3d3ef5de1c2dab477f344e2bb423001ac88b14c Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期四, 11 十一月 2021 13:20:23 +0800
Subject: [PATCH] 1111修改提交
---
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 f6e172c..68ef37a 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)) {
@@ -124,13 +134,6 @@
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>)data1);
- r.setData(loginUserInfoVO);
- }
- }
- if(R.isOk(r4)){
- String address= (String) r4.getData();
- if(StringUtils.isNotEmpty(address)){
- loginUserInfoVO.setAddress(address);
r.setData(loginUserInfoVO);
}
}
--
Gitblit v1.7.1