From 0459b8a686bc7863ecf6225ffcf34d698ad3ea85 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 27 Apr 2021 17:25:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../topic/service/impl/ResiTopicCommentServiceImpl.java       | 2 +-
 .../modules/topic/service/impl/ResiTopicServiceImpl.java      | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
index 5dd5a57b80..702c088bcf 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java
@@ -338,7 +338,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl<ResiTopicCommen
             setCacheUserInfo(topic.getGroupId(),comments);
             //支部小组人员返真实姓名
             ResiGroupEntity entity = resiGroupDao.selectById(topic.getGroupId());
-            if("".equals(entity.getGroupType())){
+            if("branch".equals(entity.getGroupType())){
                 List<String> userIds = comments.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList());
                 List<UserInfoResultDTO> userInfos = resiTopicService.disPoseUserInfo(entity.getGroupType(), userIds);
                 comments.forEach(item -> {
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index 3ad919e6d3..e59cd1f0b5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1380,7 +1380,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             resultDTOList.forEach(re->{
                 if(topicInfo.getPublishedUser().equals(re.getUserId())){
                     //话题发起人
-                    topicInfo.setPublishedUser(re.getRealName() == null ? "" : re.getRealName());
+                    String street = re.getStreet() == null ? "" : re.getStreet() + "-";
+                    String realName = re.getRealName() == null ? "" : re.getRealName();
+                    topicInfo.setPublishedUser(street + realName);
                 }
             });
         } else {