Skip to content

W
wecloud_im_server
Commit 81c41b05 by Future
Options

撤回删除逻辑调整

parent 98f585a9
Showing with 4 additions and 16 deletions
core/src/main/resources/mapper/ImMessageMapper.xml
...@@ -67,14 +67,9 @@ ...@@ -67,14 +67,9 @@
im_message_new.send_status, im_message_new.send_status,
im_message_new.`msg_type` AS 'type', im_message_new.`msg_type` AS 'type',
im_message_new.fk_conversation_id as conversationId im_message_new.fk_conversation_id as conversationId
-- (SELECT COUNT(id) FROM im_inbox WHERE fk_msg_id = msgId AND read_msg_status = 0) AS not_read_count,
-- (SELECT COUNT(id)
-- FROM im_inbox
-- WHERE fk_msg_id = msgId
-- AND receiver_msg_status = 0) AS not_receiver_count
FROM `im_message_new` FROM `im_message_new`
INNER JOIN `im_client` ON `im_client`.id = `im_message_new`.sender INNER JOIN `im_client` ON `im_client`.id = `im_message_new`.sender
WHERE fk_conversation_id = #{param.conversationId} and im_message_new.is_delete = 1 and im_message_new.withdraw = 0 WHERE fk_conversation_id = #{param.conversationId}
and (im_message_new.`event`=0 || (im_message_new.`event`=1 and sender != #{param.currentFkClientId} and (receivers is and (im_message_new.`event`=0 || (im_message_new.`event`=1 and sender != #{param.currentFkClientId} and (receivers is
null || (receivers !=null and FIND_IN_SET(#{param.currentFkClientId}, receivers))) )) null || (receivers !=null and FIND_IN_SET(#{param.currentFkClientId}, receivers))) ))
<if test="param.msgIdStart != null"> <if test="param.msgIdStart != null">
...@@ -84,9 +79,7 @@ ...@@ -84,9 +79,7 @@
AND im_message_new.id <![CDATA[ < ]]> #{param.msgIdEnd} AND im_message_new.id <![CDATA[ < ]]> #{param.msgIdEnd}
</if> </if>
and im_message_new.create_time > DATE_SUB(CURDATE(), INTERVAL 7 DAY) ORDER BY `im_message_new`.`id` DESC
ORDER BY `im_message_new`.`create_time` DESC
</select> </select>
...@@ -103,15 +96,10 @@ ...@@ -103,15 +96,10 @@
im_message_new.`at`, im_message_new.`at`,
im_message_new.send_status, im_message_new.send_status,
im_message_new.`msg_type` AS 'type', im_message_new.`msg_type` AS 'type',
im_message_new.fk_conversation_id as conversationId, im_message_new.fk_conversation_id as conversationId
(SELECT COUNT(id) FROM im_inbox WHERE fk_msg_id = msgId AND read_msg_status = 0) AS not_read_count,
(SELECT COUNT(id)
FROM im_inbox
WHERE fk_msg_id = msgId
AND receiver_msg_status = 0) AS not_receiver_count
FROM `im_message_new` FROM `im_message_new`
INNER JOIN `im_client` ON `im_client`.id = `im_message_new`.sender INNER JOIN `im_client` ON `im_client`.id = `im_message_new`.sender
WHERE fk_conversation_id = #{param.conversationId} and im_message_new.is_delete = 1 and im_message_new.withdraw = 0 WHERE fk_conversation_id = #{param.conversationId}
and (im_message_new.`event`=0 || (im_message_new.`event`=1 and sender != #{param.currentFkClientId} and (receivers is and (im_message_new.`event`=0 || (im_message_new.`event`=1 and sender != #{param.currentFkClientId} and (receivers is
null || (receivers !=null and FIND_IN_SET(#{param.currentFkClientId}, receivers))) )) null || (receivers !=null and FIND_IN_SET(#{param.currentFkClientId}, receivers))) ))
<if test="param.msgIdStart != null"> <if test="param.msgIdStart != null">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment