From f8a3a9826738a397bdf4aff4ca7a5116344b5a0a Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 09 五月 2024 07:26:56 +0800
Subject: [PATCH] 实现报告生成合并单元格；修复部分bug
---
framework/src/main/resources/mapper/InformationNotificationMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/framework/src/main/resources/mapper/InformationNotificationMapper.xml b/framework/src/main/resources/mapper/InformationNotificationMapper.xml
index 8141046..3283efe 100644
--- a/framework/src/main/resources/mapper/InformationNotificationMapper.xml
+++ b/framework/src/main/resources/mapper/InformationNotificationMapper.xml
@@ -3,12 +3,14 @@
<mapper namespace="com.yuanchu.mom.mapper.InformationNotificationMapper">
<select id="getPage" resultType="com.yuanchu.mom.pojo.InformationNotificationDto">
- select i.*, u.name senderUser, u2.name consigneeUserr
+ 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}
<if test="messageType != '' and messageType != null">
- where i.message_type = #{messageType}
+ and i.message_type = #{messageType}
</if>
+ order by i.create_time desc
</select>
</mapper>
--
Gitblit v1.9.3