From 7baabc20800670388eeb074c12868b8ec8ec139d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 06 三月 2025 09:51:10 +0800
Subject: [PATCH] Merge branch 'dev_cr' into dev

---
 ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
index 3936965..68a9b49 100644
--- a/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/InformationNotificationMapper.xml
@@ -13,4 +13,14 @@
         </if>
         order by i.create_time desc
     </select>
+
+    <select id="msgRoll" resultType="com.ruoyi.common.core.domain.entity.InformationNotificationDto">
+        select i.*, u.name senderUser, u2.name consigneeUser
+        from information_notification i
+        left join user u on i.sender_id = u.id
+        left join user u2 on u2.id = i.consignee_id
+        where i.consignee_id = #{userId}
+        order by i.create_time desc
+    </select>
+
 </mapper>

--
Gitblit v1.9.3