From 11938b8068c053f59b2b082657b89c5b856af538 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期二, 09 十一月 2021 17:05:08 +0800
Subject: [PATCH] Merge branch 'zhaozhengjie1104' into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 e717966..f6e172c 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
@@ -12,6 +12,7 @@
import javax.annotation.Resource;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.util.ObjectUtils;
@@ -96,6 +97,7 @@
if (!ObjectUtils.isEmpty(data)) {
LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO)data;
R r1 = communityService.detailHouse(userId);
+ R r4=communityService.selectByIdCard(loginUserInfoVO.getIdCard());
if (null != communityId && 0 != communityId) {
R r2 = communityService.detailCommunity(communityId);
if (R.isOk(r2)) {
@@ -122,6 +124,13 @@
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);
}
}
@@ -257,7 +266,7 @@
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- R r = communityService.listActivity(userId, status);
+ R r = communityService.listActivity(userId);
if (R.isOk(r)) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
--
Gitblit v1.7.1