101captain
2022-01-17 d1be18b020d9525f4bf9fa752dd1b6a174de0232
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java
@@ -270,13 +270,13 @@
    @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);
        if (R.isOk(r)) {
        R r = communityService.listActivity(userId, status);
        if (R.isOk(r)&&r.getData()!=null) {
            comActActivityVOS = (List<ComActActivityVO>)r.getData();
        }
        R r1 = partyBuildingService.listActivity(userId, communityId, status);