From 33b5b43bf58e9b8665b9e89c46e4ed0f7f4ad4a9 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 26 七月 2021 10:33:41 +0800
Subject: [PATCH] Merge branch 'test' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 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..f1c8329 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
@@ -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) {
 //            最多只能设置三条置顶状态,后边设置会取消先前设置的置顶

--
Gitblit v1.7.1