From 71f3101370c3db0ec00178d51a723816c9bcddbd Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期六, 18 三月 2023 17:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/message/MessageMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
index f1b0a73..e6e041a 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
@@ -37,7 +37,7 @@
resultType="com.ycl.vo.message.MessageVO">
SELECT
t1.id,
- t2.username as targetFrom,
+ t1.target_from,
t3.column_name as messageTypeName,
t1.`status`,
t1.body,
@@ -45,10 +45,13 @@
t1.create_time,
t1.respond_result,
t1.head,
- t4.username as createUser
+ t1.target_to,
+ t1.message_type,
+ t1.channel_code,
+ t4.username as createUser,
+ t1.phone_number
FROM
`ums_message` t1
- LEFT JOIN ums_admin t2 ON t1.target_from = t2.id
left join ums_admin t4 on t1.create_user = t4.id
LEFT JOIN ums_message_column t3 ON t3.id = t1.message_type
<where>
@@ -84,6 +87,7 @@
ORDER BY t1.create_time asc
</if>
</where>
+ order by t1.create_time desc
</select>
<select id="selectUserColumn" resultType="com.ycl.vo.message.MessageColumnUserVO">
--
Gitblit v1.8.0