组长默认已读状态

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,6 +618,8 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         if (!CollectionUtils.isEmpty(resultDTOList)) {
             //3.遍历封装数据并返回
             list.forEach(l -> {
+                //不展示组长的记录
+                if (!l.getUserId().equals(actReadViewFormDTO.getUserId())) {
                     StringBuffer name = new StringBuffer();
                     StringBuffer url = new StringBuffer();
                     resultDTOList.forEach(user -> {
@@ -639,6 +643,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
                         unRead.setUserHeadPhoto(url.toString());
                         unReadList.add(unRead);
                     }
+                }
             });
 
         }