From 2bc69b919ef626e6093d598d7eae07c8f9e3e0e4 Mon Sep 17 00:00:00 2001
From: 101captain <237651143@qq.com>
Date: 星期五, 14 一月 2022 10:56:51 +0800
Subject: [PATCH] 仁和东区代码提交
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 4 ++--
1 files changed, 2 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 0ab3364..f61b1d0 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
@@ -270,12 +270,12 @@
@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) {
LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
Long userId = loginUserInfo.getUserId();
Long communityId = loginUserInfo.getCommunityId();
List<ComActActivityVO> comActActivityVOS = new ArrayList<>();
- R r = communityService.listActivity(userId);
+ R r = communityService.listActivity(userId, status);
if (R.isOk(r)) {
comActActivityVOS = (List<ComActActivityVO>)r.getData();
}
--
Gitblit v1.7.1