diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java index 842e720615..ef6ed42a4f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java @@ -82,6 +82,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable { */ private Boolean isExpirat; + /** + * 是否变更,yes,no + */ + private String isChange = "no"; + @JsonIgnore private String userId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java index fd5637ba98..7682cc71a9 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java @@ -90,6 +90,11 @@ public class LatestTenResultDTO implements Serializable { */ private Boolean isExpirat; + /** + * 是否变更,yes,no + */ + private String isChange; + public LatestTenResultDTO() { this.id = ""; this.userId = ""; @@ -106,5 +111,6 @@ public class LatestTenResultDTO implements Serializable { this.readOrUnRead = ""; this.unReadCount = NumConstant.ZERO; this.isExpirat = false; + this.isChange = "no"; } } 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 206054893d..c73be463d4 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 @@ -862,13 +862,25 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userIds = new ArrayList<>(); + userIds.add(topicDetail.getCreatedBy()); + List userInfos = disPoseUserInfo(group.getGroupType(), userIds); + userInfos.forEach(u -> { + if (topicDetail.getCreatedBy().equals(u.getUserId())) { + resultDTO.setReleaseUserName(StringUtils.isBlank(u.getReleaseUserName()) ? "" : u.getReleaseUserName()); + resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(u.getReleaseUserHeadPhoto()) ? "" : u.getReleaseUserHeadPhoto()); + } + }); - //ResiGroupEntity group = resiGroupDao.selectById(topicDetail.getGroupId()); - ResiGroupMemberInfoRedisDTO memberRedis = - resiGroupMemberRedis.get(topicDetail.getGroupId(),topicDetail.getCreatedBy()); - if(null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())){ - resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); - resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto()); + } else { + ResiGroupMemberInfoRedisDTO memberRedis = + resiGroupMemberRedis.get(topicDetail.getGroupId(), topicDetail.getCreatedBy()); + if (null != memberRedis && StringUtils.isNotBlank(memberRedis.getUserId())) { + resultDTO.setReleaseUserName(StringUtils.isBlank(memberRedis.getUserShowName()) ? "" : memberRedis.getUserShowName()); + resultDTO.setReleaseUserHeadPhoto(StringUtils.isBlank(memberRedis.getUserHeadPhoto()) ? "" : memberRedis.getUserHeadPhoto()); + } } //4.话题关闭详情 diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index ed24cafc0d..5fd796b941 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -553,7 +553,7 @@