From 4fc3520a32f2f217d56af361cc7105871640484e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 5 Jan 2022 16:06:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E4=BA=8B-=E9=A6=96=E6=AC=A1=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E4=BA=8B=E4=BB=B6-=E4=B8=A4=E7=AB=AF=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/ResiEventServiceImpl.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
index 2c7d977980..aa8d1b9b46 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ResiEventServiceImpl.java
@@ -157,17 +157,21 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
         ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
-        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
-            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null == resiEventMentionEntity) {
+            log.warn("其他用户（非报事人、非被@的人）不需要调用此接口，直接返回");
             return;
         }
         // 这个事件已经被查看了
-        eventEntity.setReadFlag(true);
-        baseDao.updateById(eventEntity);
+        if(!eventEntity.getReadFlag()){
+            eventEntity.setReadFlag(true);
+            baseDao.updateById(eventEntity);
+        }
         // 居民端：resi_user；工作端：staff
         if(EventConstant.RESI_USER.equals(formDTO.getViewType())){
             //被@的人置为已读
-            resiEventMentionDao.updateReadFlag(formDTO.getEventId(),formDTO.getUserId());
+            if (EventConstant.UN_READ.equals(resiEventMentionEntity.getReadFlag())) {
+                resiEventMentionDao.updateReadFlag(formDTO.getEventId(), formDTO.getUserId());
+            }
         }else if(EventConstant.STAFF.equals(formDTO.getViewType())){
             // 当前组织置为已读
             resiEventReportOrgDao.updateReadFlag(formDTO.getEventId(),formDTO.getOrgId(),formDTO.getUserId());