报事-首次查看事件-两端通用接口调整

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) {
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) || null == resiEventMentionEntity) {
-            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
+            log.warn("其他用户（非报事人、非被@的人）不需要调用此接口，直接返回");
             return;
         }
         // 这个事件已经被查看了
-        eventEntity.setReadFlag(true);
+        if(!eventEntity.getReadFlag()){
-        baseDao.updateById(eventEntity);
+            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());