From 116fae24eda263906151249c0ad4661fba9a79bf Mon Sep 17 00:00:00 2001
From: lijingtao <18301674552@163.COM>
Date: Sat, 16 Mar 2024 13:11:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=86=E9=A1=B5=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=B7=B2=E8=AF=BB=20=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8C=85=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E4=BB=BB=E5=8A=A1=E5=8C=85=E5=90=8D=E7=A7=B0=20?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A47=E6=9D=A1=20=E5=8F=AF=E4=BB=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=B3=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/oa/OcrMsgMapper.xml | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml
index b89f8873..d60b1f93 100644
--- a/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml
+++ b/jyjz-system/jyjz-system-oa/src/main/resources/mapper/oa/OcrMsgMapper.xml
@@ -32,32 +32,33 @@
 
         <if test='msgCategory == "2" '>
             SELECT
-            id,
-            titile,
-            "系统管理员" as userNcame,
-            bus_json as busJson,
-            send_time as sendTime
+            m.id as id,
+            m.titile as titile,
+            "系统管理员" AS userNcame,
+            m.bus_json AS busJson,
+            r.read_flag as readFlag,
+            m.send_time AS sendTime
             FROM
-            ocr_msg
+            ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
-            msg_category = '2'
-            AND
-            receive_user_type = '1'
-            AND FIND_IN_SET( ""#{userid}"", receive_user_ids )
+            m.msg_category = '2'
+            AND m.receive_user_type = '1'
+            AND FIND_IN_SET( ""#{userid}"", m.receive_user_ids )
 
             UNION ALL
+
             SELECT
-            id,
-            titile,
-            "系统管理员" as userNcame,
-            bus_json as busJson,
-            send_time as sendTime
+            m.id as id,
+            m.titile as titile,
+            "系统管理员" AS userNcame,
+            m.bus_json AS busJson,
+            r.read_flag as readFlag,
+            m.send_time AS sendTime
             FROM
-            ocr_msg
+            ocr_msg m  LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
-            msg_category = '2'
-            AND
-            receive_user_type = '2'
+            m.msg_category = '2'
+            AND m.receive_user_type = '2'
         </if>
 
         <if test='msgCategory == "1" '>
@@ -66,9 +67,11 @@
             m.titile as titile,
             u.USERNAME as userName,
             m.bus_json as busJson,
+            r.read_flag as readFlag,
             m.send_time as sendTime
             FROM
             ocr_msg m LEFT JOIN s_user_t u ON m.sender=u.ID
+            LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
             m.msg_category = '1'
             AND
@@ -81,9 +84,11 @@
             m.titile as titile,
             u.USERNAME as userName,
             m.bus_json as busJson,
+            r.read_flag as readFlag,
             m.send_time as sendTime
             FROM
             ocr_msg m LEFT JOIN s_user_t u ON m.sender=u.ID
+            LEFT JOIN ocr_msg_read r ON m.id = r.msg_id
             WHERE
             m.msg_category = '1'
             AND