From 60784a329fd3cf9f4b6a75b8dc39ff79bd907dc6 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期三, 02 三月 2022 09:16:40 +0800
Subject: [PATCH] Merge branch 'hemenkou_dev' into dev
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 0ab3364..0a6de9d 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
@@ -153,6 +153,7 @@
public R putUserAuthentication(@RequestBody @Validated(AddGroup.class) LoginUserInfoVO loginUserInfoVO) {
Long userId = this.getUserId();
loginUserInfoVO.setUserId(userId);
+ loginUserInfoVO.setCommunityId(this.getCommunityId());
R r = userService.putUserAuthentication(loginUserInfoVO);
if (R.isOk(r)) {
// 通过发通知
@@ -268,19 +269,18 @@
}
@ApiOperation(value = "我的活动", response = ComActActivityVO.class)
- @ApiImplicitParam(name = "status", value = "活动状态（4 进行中 5 已结束 6 已取消）", required = false)
@GetMapping("listactivity")
- public R listActivity(@RequestParam("status") Integer status) {
+ public R listActivity(@RequestParam(value = "status", required = false) Integer status,@RequestParam(value = "type", required = false) Integer type) {
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)) {
+ R r = communityService.listActivity(userId, status,type);
+ if (R.isOk(r)&&r.getData()!=null) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
R r1 = partyBuildingService.listActivity(userId, communityId, status);
- if (R.isOk(r1)) {
+ if (R.isOk(r1)&&r1.getData()!=null) {
List<ComActActivityVO> data = (List<ComActActivityVO>)r1.getData();
comActActivityVOS.addAll(data);
}
--
Gitblit v1.7.1