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 @@ 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' @@ -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