bug

huanghongfa

2021-01-20 fb4f898f9dbb2b5743a061912c310985d42197f4

 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);
    }