From 7a8f3a04acc14191820ff8a3d915ed4fb7a4ad69 Mon Sep 17 00:00:00 2001
From: infrasys00 <blackdancers@163.com>
Date: 星期六, 20 二月 2021 09:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 fcf7176..46da1b7 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
@@ -109,7 +109,7 @@
sysUserNoticeVO.setBusinessType(6);
// sysUserNoticeVO.setBusinessTitle(comActActivityVO.getActivityName());
sysUserNoticeVO.setBusinessContent(String.format("驳回原因：%s",r.getMsg()));
-// sysUserNoticeVO.setBusinessId(activityId);
+// sysUserNoticeVO.setBusinessId(activityId);R
sysUserNoticeVO.setStatus(0);
sysUserNoticeVO.setBusinessStatus(1);
R r1 = userService.addNotice(sysUserNoticeVO);
@@ -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);
}
@@ -220,10 +224,9 @@
@PostMapping("pageeasyphoto")
public R pageEasyPhoto(@RequestBody ComActEasyPhotoVO comActEasyPhotoVO) {
Long userId = this.getUserId();
- comActEasyPhotoVO.setUserId(userId);
- comActEasyPhotoVO.setLogInUserId(userId);
+ comActEasyPhotoVO.setSponsorId(userId);
comActEasyPhotoVO.setCommunityId(null);
- return communityService.pageEasyPhoto(comActEasyPhotoVO);
+ return communityService.pageEasyPhotoApplets(comActEasyPhotoVO);
}
@ApiOperation(value = "分页查询我的微心愿",response = ComActMicroWishVO.class )
--
Gitblit v1.7.1