From 70a29ae28b85643e00a4b7fbf111a95646a24dc2 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Wed, 20 Mar 2024 17:20:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/messageRecord/mapper/MessageRecordMapper.xml | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/messageRecord/mapper/MessageRecordMapper.xml b/src/main/java/org/springblade/modules/messageRecord/mapper/MessageRecordMapper.xml
index 7d3242d..f508b36 100644
--- a/src/main/java/org/springblade/modules/messageRecord/mapper/MessageRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/messageRecord/mapper/MessageRecordMapper.xml
@@ -4,7 +4,9 @@
<select id="selectMessageRecordPage" resultType="org.springblade.modules.messageRecord.vo.MessageRecordVO">
- select bmr.* from blade_message_record bmr
+ select bmr.*,GROUP_CONCAT(bu.real_name) userName
+ from blade_message_record bmr
+ LEFT JOIN blade_user bu on bmr.receiver like CONCAT('%',bu.id,'%')
where bmr.is_deleted = 0
<if test="vo.type != null and vo.type !=''">
and bmr.type LIKE CONCAT('%',#{vo.type},'%')
@@ -18,6 +20,13 @@
<if test="vo.title != null and vo.title != ''">
and bmr.title LIKE CONCAT('%',#{vo.title},'%')
</if>
+ <if test="vo.createUser != null and vo.createUser != ''">
+ and bmr.create_user = #{vo.createUser}
+ </if>
+ <if test="vo.messageResource != null and vo.messageResource !=''">
+ and bmr.message_resource = #{vo.messageResource}
+ </if>
+ GROUP BY bmr.id
</select>
--
Gitblit v1.9.3