diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java index 60c079d945..aecf370b48 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java @@ -198,15 +198,17 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl{ actReadRecordDao.insert(readRecordEntity); @@ -616,28 +618,31 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl { - StringBuffer name = new StringBuffer(); - StringBuffer url = new StringBuffer(); - resultDTOList.forEach(user -> { - if (l.getUserId().equals(user.getUserId())) { - name.append(user.getSurname()).append(user.getName()); - url.append(user.getHeadImgUrl()); + //不展示组长的记录 + if (!l.getUserId().equals(actReadViewFormDTO.getUserId())) { + StringBuffer name = new StringBuffer(); + StringBuffer url = new StringBuffer(); + resultDTOList.forEach(user -> { + if (l.getUserId().equals(user.getUserId())) { + name.append(user.getSurname()).append(user.getName()); + url.append(user.getHeadImgUrl()); + } + }); + if (GroupActConstant.READ.equals(l.getReadFlag())) { + //已读 + NoticeReadListResultDTO.NoticeReafdRecord read = new NoticeReadListResultDTO.NoticeReafdRecord(); + read.setUserId(l.getUserId()); + read.setUserName(name.toString()); + read.setUserHeadPhoto(url.toString()); + readList.add(read); + } else { + //未读 + NoticeReadListResultDTO.NoticeReafdRecord unRead = new NoticeReadListResultDTO.NoticeReafdRecord(); + unRead.setUserId(l.getUserId()); + unRead.setUserName(name.toString()); + unRead.setUserHeadPhoto(url.toString()); + unReadList.add(unRead); } - }); - if (GroupActConstant.READ.equals(l.getReadFlag())) { - //已读 - NoticeReadListResultDTO.NoticeReafdRecord read = new NoticeReadListResultDTO.NoticeReafdRecord(); - read.setUserId(l.getUserId()); - read.setUserName(name.toString()); - read.setUserHeadPhoto(url.toString()); - readList.add(read); - } else { - //未读 - NoticeReadListResultDTO.NoticeReafdRecord unRead = new NoticeReadListResultDTO.NoticeReafdRecord(); - unRead.setUserId(l.getUserId()); - unRead.setUserName(name.toString()); - unRead.setUserHeadPhoto(url.toString()); - unReadList.add(unRead); } });