组长默认已读状态

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<GroupActInfoDao, Gr
             ActReadRecordEntity actReadRecordEntity=new ActReadRecordEntity();
             actReadRecordEntity.setCustomerId(groupActInfoEntity.getCustomerId());
             actReadRecordEntity.setGroupActId(groupActInfoEntity.getId());
-            actReadRecordEntity.setReadFlag(GroupActConstant.UN_READ);
             actReadRecordEntity.setUserId(memberDTO.getCustomerUserId());
             actReadRecordEntity.setShouldBeRead(Constant.YES);
             actReadRecordEntity.setGroupId(groupActInfoEntity.getGroupId());
             actReadRecordEntity.setGridId(groupActInfoEntity.getGridId());
+            //组长默认已读，组员默认未读
             if(!groupActInfoEntity.getPublishUserId().equals(memberDTO.getCustomerUserId())){
-                //组长不记录 已读记录
-                readRecordEntityList.add(actReadRecordEntity);
+                actReadRecordEntity.setReadFlag(GroupActConstant.UN_READ);
+            }else{
+                actReadRecordEntity.setReadFlag(GroupActConstant.READ);
             }
+            readRecordEntityList.add(actReadRecordEntity);
         });
         readRecordEntityList.forEach(readRecordEntity->{
             actReadRecordDao.insert(readRecordEntity);
@@ -616,28 +618,31 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         if (!CollectionUtils.isEmpty(resultDTOList)) {
             //3.遍历封装数据并返回
             list.forEach(l -> {
-                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);
                 }
             });