From 9e299e1219d6a6cfe3651d58e48a0952ae102fc0 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 30 Apr 2021 10:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E8=AF=BB=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8Cact=5Fread=5Frecord=E4=B8=8D=E5=86=8D=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../act/service/impl/GroupActInfoServiceImpl.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

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 58ac631f4f..e828595573 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
@@ -514,20 +514,21 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         if(AppClientConstant.APP_RESI.equals(formDTO.getClient())){
             ActReadRecordEntity actReadRecordEntity = actReadRecordDao.selectUserRec(formDTO.getGroupActId(), formDTO.getUserId());
             if (null != actReadRecordEntity) {
-                if(!GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
+                if(GroupActConstant.CLOSED.equals(groupActInfoEntity.getStatus())){
+                    if(GroupActConstant.UN_READ.equals(actReadRecordEntity.getViewDetail())){
+                        //如果活动关闭，则不更新已读、未读。只记录是否查看过详情。
+                        actReadRecordEntity.setUpdatedTime(new Date());
+                        actReadRecordEntity.setViewDetail(GroupActConstant.READ);
+                        actReadRecordDao.updateById(actReadRecordEntity);
+                    }
+                }else{
                     //非关闭状态下，返回详情，并且已读状态
                     if (GroupActConstant.UN_READ.equals(actReadRecordEntity.getReadFlag())) {
-                        //未读->已读
                         actReadRecordEntity.setReadFlag(GroupActConstant.READ);
                         actReadRecordEntity.setUpdatedTime(new Date());
                         actReadRecordEntity.setViewDetail(GroupActConstant.READ);
                         actReadRecordDao.updateById(actReadRecordEntity);
                     }
-                }else{
-                    //如果活动关闭，则不更新已读、未读。只记录是否查看过详情。
-                    actReadRecordEntity.setUpdatedTime(new Date());
-                    actReadRecordEntity.setViewDetail(GroupActConstant.READ);
-                    actReadRecordDao.updateById(actReadRecordEntity);
                 }
             }
         }