Merge branch 'dev_group_act_notice' into dev_temp

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -13,7 +13,7 @@
                        ELSE '先生/女士' END
                 ) AS userShowName,
             HEAD_IMG_URL AS headPhoto,
-            REAL_NAME AS realName
+            CONCAT(STREET,'-',REAL_NAME) AS realName
         FROM user_base_info
         WHERE DEL_FLAG = 0
           AND

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicCommentServiceImpl.java

@@ -360,7 +360,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 -> {

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -1461,7 +1461,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 {