auth

huanghongfa

2021-02-01 b3c6911c1e78563dc04998dd7bfb510130a9fcec

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -213,6 +213,10 @@
            List<ComActActivityVO> collect = comActActivityVOS1.stream().sorted(Comparator.comparing(ComActActivityVO::getBeginAt).reversed()).collect(Collectors.toList());
            comActActivityVOS=collect;
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
            List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
            return R.ok(collect);
        }
        return R.ok(comActActivityVOS);
    }

@@ -221,9 +225,7 @@
    public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
        Long userId = this.getUserId();
        comActEasyPhotoVO.setSponsorId(userId);
        comActEasyPhotoVO.setLogInUserId(userId);
        comActEasyPhotoVO.setCommunityId(null);
//        return communityService.pageEasyPhoto(comActEasyPhotoVO);
        return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
    }