From 9840d5b42aeb53f9ac7e4121101913592ca6da5f Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 30 十二月 2020 14:50:29 +0800
Subject: [PATCH] 测试版本
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 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 1d33220..e2ba7a4 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
@@ -57,26 +57,30 @@
if (!ObjectUtils.isEmpty(data)) {
LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
R r1 = communityService.detailHouse(userId);
- R r2=communityService.detailCommunity(communityId);
- R r3=communityService.detailArea(areaId);
+ if (null!=communityId&&0!=communityId) {
+ R r2=communityService.detailCommunity(communityId);
+ if (R.isOk(r2)) {
+ Object data1 = r2.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
+ if (null!=areaId&&areaId!=0) {
+ R r3=communityService.detailArea(areaId);
+ if (R.isOk(r3)) {
+ Object data1 = r3.getData();
+ if (!ObjectUtils.isEmpty(data1)) {
+ loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class));
+ r.setData(loginUserInfoVO);
+ }
+ }
+ }
if (R.isOk(r1)) {
Object data1 = r1.getData();
if (!ObjectUtils.isEmpty(data1)) {
loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>) data1);
- r.setData(loginUserInfoVO);
- }
- }
- if (R.isOk(r2)) {
- Object data1 = r2.getData();
- if (!ObjectUtils.isEmpty(data1)) {
- loginUserInfoVO.setComActVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComActVO.class));
- r.setData(loginUserInfoVO);
- }
- }
- if (R.isOk(r3)) {
- Object data1 = r3.getData();
- if (!ObjectUtils.isEmpty(data1)) {
- loginUserInfoVO.setComMngStructAreaVO(JSONObject.parseObject(JSONObject.toJSONString(data1),ComMngStructAreaVO.class));
r.setData(loginUserInfoVO);
}
}
--
Gitblit v1.7.1