From f7d7e5b1eeed518b896bd1822c612a13856bcf60 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期一, 02 八月 2021 13:35:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into txb
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
index d60ae2a..17868ae 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java
@@ -258,7 +258,7 @@
* @return 详情
*/
@PostMapping("detailactivity")
- public R detailActivity(@RequestParam("id") Long id, @RequestParam("userId") Long userId) {
+ public R detailActivity(@RequestParam("id") Long id, @RequestParam(value = "userId",required = false) Long userId) {
ComActActivityVO comActActivityVO = comActActivityService.inforActivity(id, userId);
if (ObjectUtils.isEmpty(comActActivityVO)) {
return R.fail("活动不存在");
@@ -379,7 +379,6 @@
return R.fail("未查到社区动态记录");
}
// Long id = comActDynVO.getId();
- BeanUtils.copyProperties(comActDynVO, comActDynDO);
Integer isTopping = comActDynVO.getIsTopping();
boolean b = isTopping.equals(1);
if(b){
@@ -388,6 +387,12 @@
return R.fail("待发布的社区动态不可置顶");
}
}
+
+// if(StringUtils.isEmpty(comActDynVO.getCover())){
+// comActDynVO.setCover(comActDynDO.getCover());
+// }
+ BeanUtils.copyProperties(comActDynVO, comActDynDO);
+
boolean update = comActDynService.updateById(comActDynDO);
if (update) {
// 最多只能设置三条置顶状态，后边设置会取消先前设置的置顶
@@ -1784,4 +1789,6 @@
public R readUserReward(@RequestParam("userId") Long userId,@RequestParam("communityId") Long communityId) {
return comActEasyPhotoService.readUserReward(userId,communityId);
}
+
+
}
--
Gitblit v1.7.1