From cc3cd519bfd86fd8e31e3462b13666d3819f96e7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 28 Apr 2021 16:30:41 +0800
Subject: [PATCH] =?UTF-8?q?readFlag=E4=BF=AE=E6=94=B9=20VIEW=5FDETAIL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/group/ResiGroupDao.xml   | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 59c565d694..38140fe84e 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -621,7 +621,7 @@
                   COUNT( 1 ) AS unRead
               FROM act_read_record
               WHERE DEL_FLAG = 0
-                AND `READ_FLAG` = 'un_read'
+                AND `VIEW_DETAIL` = 'un_read'
                 AND USER_ID = #{userId}
                 AND GROUP_ID = #{groupId})
              UNION ALL
@@ -629,7 +629,7 @@
                   COUNT( 1 ) AS unRead
               FROM notice_read_record
               WHERE DEL_FLAG = 0
-                AND READ_FLAG = 'un_read'
+                AND VIEW_DETAIL = 'un_read'
                 AND USER_ID = #{userId}
                 AND GROUP_ID = #{groupId})) temp
     </select>
@@ -637,7 +637,7 @@
     <!-- 查询阅读状态 -->
     <select id="selectUserReadFlag" resultType="com.epmet.resi.group.dto.group.result.UserReadFlagResultDTO">
         (SELECT
-             READ_FLAG,
+             VIEW_DETAIL AS readFlag,
              USER_ID,
              GROUP_ACT_ID AS id
          FROM act_read_record
@@ -652,7 +652,7 @@
         )
         UNION ALL
         (SELECT
-             READ_FLAG,
+             VIEW_DETAIL AS readFlag,
              USER_ID,
              NOTICE_ID AS id
          FROM notice_read_record
@@ -679,7 +679,7 @@
                     GROUP_ACT_ID = #{id}
                 </foreach>
             )
-           AND `READ_FLAG` = 'un_read'
+           AND `VIEW_DETAIL` = 'un_read'
            AND GROUP_ID = #{groupId}
          GROUP BY GROUP_ACT_ID
         )
@@ -694,7 +694,7 @@
                     NOTICE_ID = #{id}
                 </foreach>
             )
-           AND `READ_FLAG` = 'un_read'
+           AND `VIEW_DETAIL` = 'un_read'
            AND GROUP_ID = #{groupId}
          GROUP BY NOTICE_ID
         )
@@ -707,7 +707,7 @@
              GROUP_ACT_ID AS id
          FROM act_read_record
          WHERE DEL_FLAG = 0
-           AND READ_FLAG = 'un_read'
+           AND VIEW_DETAIL = 'un_read'
            AND USER_ID = #{userId}
            AND GROUP_ID = #{groupId}
         )
@@ -717,7 +717,7 @@
              NOTICE_ID AS id
          FROM notice_read_record
          WHERE DEL_FLAG = 0
-           AND READ_FLAG = 'un_read'
+           AND VIEW_DETAIL = 'un_read'
            AND USER_ID = #{userId}
            AND GROUP_ID = #{groupId}
         )
@@ -833,7 +833,7 @@
 
     <!-- 根据用户ID和【活动、通知ID】查询阅读状态 -->
     <select id="selectReadFlagByUserAndId" resultType="com.epmet.resi.group.dto.notice.result.ReadStatusResultDTO">
-        (SELECT USER_ID, read_flag, GROUP_ACT_ID AS id
+        (SELECT USER_ID, VIEW_DETAIL AS readFlag, GROUP_ACT_ID AS id
          FROM act_read_record WHERE DEL_FLAG = 0
          AND (
              <foreach collection="userIds" item="userId" separator=" OR ">
@@ -847,7 +847,7 @@
         )
         )
         UNION ALL
-        (SELECT USER_ID, read_flag, NOTICE_ID AS id
+        (SELECT USER_ID, VIEW_DETAIL AS readFlag, NOTICE_ID AS id
          FROM notice_read_record WHERE DEL_FLAG = 0
         AND (
         <foreach collection="userIds" item="userId" separator=" OR ">