From afa0dbb4f54e7244835dd67ec33c3e545f122f71 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 17 一月 2025 16:40:43 +0800
Subject: [PATCH] bug修改
---
ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
index f457ab0..35f2fa7 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
+++ b/ruoyi-modules/ruoyi-shop/src/main/resources/mapper/task/MemberTaskRecordMapper.xml
@@ -85,11 +85,12 @@
tmtr.follow_type followType,
tmtr.call_time callTime,
tmtr.follow_content followContent,
+ tmtr.custome_follow_type customeFollowType,
tmtr.call_phone callPhone
FROM t_member_task tmt
INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
- WHERE tmt.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
- ORDER BY tmt.task_date DESC
+ WHERE tmt.del_flag = 0 AND tmtr.del_flag = 0 AND tmt.shop_id = #{param.shopId} AND tmt.user_id = #{param.memberUserId}
+ ORDER BY tmtr.create_time DESC
</select>
<select id="pageMgtMemberFollow" resultType="com.ruoyi.shop.domain.vo.MgtMemberFollowPageVo">
@@ -101,6 +102,7 @@
tmtr.task_id taskId,
tmt.task_date taskDate,
tmtr.follow_type followType,
+ tmtr.custome_follow_type customeFollowType,
tmtr.call_time callTime,
tmtr.follow_content followContent,
tmtr.call_phone callPhone
@@ -108,7 +110,7 @@
INNER JOIN t_member_task_record tmtr ON tmtr.task_id = tmt.task_id
INNER JOIN t_shop ts ON ts.shop_id = tmt.shop_id
INNER JOIN t_shop_file tsf ON tsf.shop_id = ts.shop_id AND tsf.del_flag = 0 AND tsf.file_type = 1
- WHERE tmt.del_flag = 0 AND tmt.user_id = #{param.memberUserId} AND tmr.task_date = #{param.taskDate}
+ WHERE tmt.del_flag = 0 AND tmt.user_id = #{param.memberUserId} AND tmt.task_date = #{param.taskDate}
ORDER BY tmt.task_date DESC
</select>
--
Gitblit v1.7.1