From aad170db8e65a67d1ba34e72a21eb19d91a05373 Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期二, 30 十一月 2021 17:26:22 +0800
Subject: [PATCH] Merge branch 'test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into test
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 65b9195..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);
}
}
@@ -259,8 +262,9 @@
}
@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
+ @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
@GetMapping("listactivity")
- public R listActivity() {
+ public R listActivity(@RequestParam("status") Integer status) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
@@ -269,7 +273,7 @@
if (R.isOk(r)) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
- R r1 = partyBuildingService.listActivity(userId, communityId);
+ R r1 = partyBuildingService.listActivity(userId, communityId, status);
if (R.isOk(r1)) {
List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
comActActivityVOS.addAll(data);
--
Gitblit v1.7.1