diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml index 7e72f2a85e..1ce45a28d8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml +++ b/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 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 ab19520239..f648ec88ec 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 @@ -360,7 +360,7 @@ public class ResiTopicCommentServiceImpl extends BaseServiceImpl userIds = comments.stream().map(m -> m.getUserId()).distinct().collect(Collectors.toList()); List 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 af610fd84e..fff75265a7 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 @@ -1461,7 +1461,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl{ 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 {