From dd5b15229cb15459fa7c31ccea77dac28cbfafbd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 13 四月 2020 10:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgInviteDetailMapper.xml | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgInviteDetailMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgInviteDetailMapper.xml
index 212c4c0..da9942a 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgInviteDetailMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgInviteDetailMapper.xml
@@ -12,7 +12,7 @@
<result column="mi_read" property="read" jdbcType="BOOLEAN" />
<result column="mi_create_time" property="createTime" jdbcType="TIMESTAMP" />
<result column="mi_update_time" property="updateTime" jdbcType="TIMESTAMP" />
-
+ <result column="extraInfo" property="extraInfo" jdbcType="VARCHAR"/>
<association property="inviteUser" column="mi_invite_id"
javaType="com.yeshi.fanli.entity.bus.user.ThreeSale">
<id column="mi_invite_id" property="id" jdbcType="BIGINT" />
@@ -57,12 +57,14 @@
<select id="listByUid" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- ,u.`id`,u.`nick_name`,u.`portrait` FROM yeshi_ec_msg_invite i LEFT
- JOIN yeshi_ec_threesale t ON t.`id`=i.`mi_invite_id` LEFT JOIN
- yeshi_ec_user u ON u.`id`=t.`worker_id` where mi_uid = #{uid} order by
- mi_update_time desc limit #{start},#{count}
+ select <include refid="Base_Column_List" />,u.`id`,u.`nick_name`,u.`portrait`,
+ te.`mea_content` AS extraInfo FROM yeshi_ec_msg_invite i
+ LEFT JOIN yeshi_ec_threesale t ON t.`id`=i.`mi_invite_id`
+ LEFT JOIN yeshi_ec_user u ON u.`id`=t.`worker_id`
+ LEFT JOIN `yeshi_ec_msg_extra` te ON (te.`mea_rid` = i.`mi_id` AND te.`mea_type` = 'invite')
+ where mi_uid = #{uid}
+ order by mi_update_time desc
+ limit #{start},#{count}
</select>
--
Gitblit v1.8.0