|
|
@ -2345,7 +2345,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
List<String> ids = latestTenData.stream().map(m -> m.getId()).collect(Collectors.toList()); |
|
|
|
List<UserInfoResultDTO> userInfos = disPoseUserInfo(result.getGroupType(), userIds); |
|
|
|
// 查询用户的 活动或通知的 阅读状态
|
|
|
|
List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag(groupId, userId, ids); |
|
|
|
List<UserReadFlagResultDTO> userReadFlag = resiGroupDao.selectUserReadFlag( userId, ids); |
|
|
|
// 查询小组下的 通知或活动 未读人数
|
|
|
|
List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(groupId, ids); |
|
|
|
latestTenData.forEach(l -> { |
|
|
@ -2365,7 +2365,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi |
|
|
|
// 用户已读,未读
|
|
|
|
if (!CollectionUtils.isEmpty(userReadFlag)){ |
|
|
|
userReadFlag.forEach(u -> { |
|
|
|
if (l.getUserId().equals(u.getUserId()) && l.getId().equals(u.getId())){ |
|
|
|
if (l.getId().equals(u.getId())){ |
|
|
|
l.setReadOrUnRead(u.getReadFlag()); |
|
|
|
} |
|
|
|
}); |
|
|
|