From 5db08d9752152c5f12631f7e7b4f9d70f9fbeafe Mon Sep 17 00:00:00 2001
From: zhangchenbiao <chenbiao.zhang@coolcollege.cn>
Date: Wed, 23 Aug 2023 17:45:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E4=BB=BB=E5=8A=A1=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=BA=BF=E7=B4=A2=E7=A7=81=E6=B5=B7=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/HyFollowTaskMapper.xml      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
index f8634c934..bf939f198 100644
--- a/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
+++ b/coolstore-partner-dao/src/main/resources/mapper/HyFollowTaskMapper.xml
@@ -157,7 +157,7 @@
             a.update_time
         from
             hy_follow_task a
-                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0'
+                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2')
         where
             a.deleted = '0' and a.follow_user_id = #{followUserId}
             <if test="taskStatus != null">
@@ -194,7 +194,7 @@
             a.follow_user_id
         from
             hy_follow_task a
-                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0'
+                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2')
         where
             a.deleted = '0' and (a.task_status in ('2') or (a.task_status in ('0') and a.deadline >= #{startTime} and #{endTime} >= a.deadline))
     </select>
@@ -206,7 +206,7 @@
             sum(if(a.task_status=0 and #{endTime} > a.deadline, 1, 0)) as todoNum
         from
             hy_follow_task a
-                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0'
+                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2')
         where
             a.follow_user_id in <foreach collection="followUserIds" item="followUserId" separator="," open="(" close=")">#{followUserId}</foreach>
         group by a.follow_user_id
@@ -228,7 +228,7 @@
             a.update_time
         from
             hy_follow_task a
-                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0'
+                inner join hy_partner_line_info b on a.partner_line_id = b.id and b.deleted = '0' and b.line_status in ('1', '2')
         where
             a.deleted = '0' and a.task_status in ('0') and a.deadline > #{startTime} and #{endTime} > a.deadline
     </select>