From 23e9f7463069b31b5455c0d85deec5245bd18359 Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期三, 20 一月 2021 14:57:53 +0800
Subject: [PATCH] 活动
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 5aa0757..4b7ed60 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
@@ -171,13 +171,15 @@
@ApiOperation(value = "我的活动",response =ComActActivityVO.class )
@GetMapping("listactivity")
public R listActivity() {
- Long userId = this.getUserId();
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ Long userId = loginUserInfo.getUserId();
+ Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS=new ArrayList<>();
R r=communityService.listActivity(userId);
if (R.isOk(r)) {
comActActivityVOS =(List<ComActActivityVO>) r.getData();
}
- R r1=partyBuildingService.listActivity(userId);
+ R r1=partyBuildingService.listActivity(userId,communityId);
if (R.isOk(r1)) {
List<ComActActivityVO> data = (List<ComActActivityVO>) r1.getData();
comActActivityVOS.addAll(data);
@@ -208,6 +210,13 @@
Long userId = this.getUserId();
comActMicroWishVO.setUserId(userId);
comActMicroWishVO.setCommunityId(null);
+ Integer status = comActMicroWishVO.getStatus();
+ if (null!=status&&status==1) {
+ comActMicroWishVO.setIsPageMyWish(1);
+ }else{
+ comActMicroWishVO.setIsPageMyWish(null);
+ }
+
return communityService.pageMicroWish(comActMicroWishVO);
}
--
Gitblit v1.7.1