测试版本

huanghongfa

2020-12-30 9840d5b42aeb53f9ac7e4121101913592ca6da5f

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -57,15 +57,8 @@
            if (!ObjectUtils.isEmpty(data)) {
                LoginUserInfoVO loginUserInfoVO = (LoginUserInfoVO) data;
                R r1 = communityService.detailHouse(userId);
                if (null!=communityId&&0!=communityId) {
                R r2=communityService.detailCommunity(communityId);
                R r3=communityService.detailArea(areaId);
                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)) {
@@ -73,6 +66,9 @@
                        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)) {
@@ -81,6 +77,14 @@
                    }
                }
            }
                if (R.isOk(r1)) {
                    Object data1 = r1.getData();
                    if (!ObjectUtils.isEmpty(data1)) {
                        loginUserInfoVO.setComMngStructHouseVOS((List<ComMngStructHouseVO>) data1);
                        r.setData(loginUserInfoVO);
                    }
                }
            }
        }
        return r;
    }