From c6e32737c36455481ecba26b5afae487789c862d Mon Sep 17 00:00:00 2001
From: yeungchihang <842328916@qq.com>
Date: Wed, 19 Oct 2022 11:02:37 +0800
Subject: [PATCH] =?UTF-8?q?v1.1=20=E5=8A=A8=E6=80=81-=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81-vo=E5=8A=A0=E4=B8=8AworldName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/html/qiniu_upload_admin.html    | 3 +--
 .../java/com/accompany/community/vo/MyDynamicInfoVo.java  | 3 +++
 .../business/service/community/DynamicService.java        | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/accompany-admin/accompany-admin-web/src/main/resources/static/html/qiniu_upload_admin.html b/accompany-admin/accompany-admin-web/src/main/resources/static/html/qiniu_upload_admin.html
index aafd6d112..0ed4bc1f7 100644
--- a/accompany-admin/accompany-admin-web/src/main/resources/static/html/qiniu_upload_admin.html
+++ b/accompany-admin/accompany-admin-web/src/main/resources/static/html/qiniu_upload_admin.html
@@ -68,8 +68,7 @@
     </div>
 </section>
 
-<div class=" modal fade" id="fileUpload" tabindex="-1" role="dialog" aria-labelledby="modalLabel1"
->
+<div class=" modal fade" id="fileUpload" tabindex="-1" role="dialog" aria-labelledby="modalLabel1">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/accompany-business/accompany-business-community/src/main/java/com/accompany/community/vo/MyDynamicInfoVo.java b/accompany-business/accompany-business-community/src/main/java/com/accompany/community/vo/MyDynamicInfoVo.java
index d0fc6674d..6ad39cc29 100644
--- a/accompany-business/accompany-business-community/src/main/java/com/accompany/community/vo/MyDynamicInfoVo.java
+++ b/accompany-business/accompany-business-community/src/main/java/com/accompany/community/vo/MyDynamicInfoVo.java
@@ -19,6 +19,9 @@ public class MyDynamicInfoVo {
     private Long uid;
 
     private Long worldId;
+    private Long worldUid;
+    private String worldName;
+    private Boolean inWorld;
 
     private String content;
 
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java
index 05d6a7231..aa22b4e27 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/community/DynamicService.java
@@ -419,6 +419,14 @@ public class DynamicService extends CommunityBaseService {
                     dynamic.setDynamicResList(Arrays.asList(resVo));
                 }
             }
+            if (dynamic.getWorldId() != null){
+                World world = worldService.getByIdFromCache(dynamic.getWorldId());
+                if (null != world) {
+                    dynamic.setWorldUid(world.getOwnerUid());
+                    dynamic.setWorldName(world.getName());
+                    dynamic.setInWorld(worldService.isInWorld(request.getUid(), dynamic.getWorldId()));
+                }
+            }
         });
         //加入轻寻第一天
         if(CollectionUtils.isEmpty(myDynamicList) && request.getPage() == 1) {