From a0ba787b3d6d21e92172b4ecf5ddf2a63b7c2864 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 5 Aug 2021 14:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=8A=A5=E4=BA=8B=E4=BA=BA?=
 =?UTF-8?q?=E6=98=AF=E4=BA=BA=E5=A4=A7=E4=BB=A3=E8=A1=A8=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E4=B8=94=E8=87=AA=E5=B7=B1=E8=89=BE=E7=89=B9=E4=BA=86=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=EF=BC=8C=E5=9C=A8=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=B7=B2=E8=AF=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/ResiEventMentionDao.java   | 2 ++
 .../java/com/epmet/service/impl/ResiEventServiceImpl.java  | 5 +++--
 .../src/main/resources/mapper/ResiEventMentionDao.xml      | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
index 15062a1385..76aaeb9162 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ResiEventMentionDao.java
@@ -65,4 +65,6 @@ public interface ResiEventMentionDao extends BaseDao<ResiEventMentionEntity> {
      * @date 2021/8/4 17:41
      */
     int updateRedDotShow(@Param("resiEventId") String resiEventId,@Param("excludeUserId")String excludeUserId);
+
+    ResiEventMentionEntity selectUser(@Param("eventId") String eventId, @Param("userId")String userId);
 }
\ No newline at end of file
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 b102b84c85..ebeda707f1 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
@@ -120,8 +120,9 @@ public class ResiEventServiceImpl extends BaseServiceImpl<ResiEventDao, ResiEven
         if (null == eventEntity) {
             throw new RenException(String.format("没有找到事件记录,eventId:%s",formDTO.getEventId()));
         }
-        if(formDTO.getUserId().equals(eventEntity.getReportUserId())){
-            log.warn("报事人查看详情不需要调用此接口");
+        ResiEventMentionEntity resiEventMentionEntity=resiEventMentionDao.selectUser(formDTO.getEventId(),formDTO.getUserId());
+        if (formDTO.getUserId().equals(eventEntity.getReportUserId()) && null == resiEventMentionEntity) {
+            log.warn("报事人查看详情不需要调用此接口,如果既是报事人又是人大代表，自己艾特了自己，需要更新为已读");
             return;
         }
         // 这个事件已经被查看了
diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
index 88a62a2f2a..28548eaad9 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
+++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventMentionDao.xml
@@ -78,4 +78,11 @@
                 </if>
                 AND DEL_FLAG = '0'
     </update>
+
+    <select id="selectUser" parameterType="map" resultType="com.epmet.entity.ResiEventMentionEntity">
+        select rem.* from resi_event_mention rem
+        where rem.del_flag='0'
+        and rem.RESI_EVENT_ID=#{eventId}
+        and rem.user_id=#{userId}
+    </select>
 </mapper>
\ No newline at end of file