From f804e4af4ed26e15f96acf5d90ef362a61d8d8e7 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Tue, 2 Jun 2020 17:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=88=9D=E5=BF=83=E4=BA=92=E5=8A=A9?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E5=B7=B2=E5=85=B3=E9=97=AD=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E3=80=91-=E7=8E=8B=E5=85=AC=E5=B3=B0-2020?=
 =?UTF-8?q?-06-02?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/activity/ActInfoDao.xml         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 946d836eb..2240bde81 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -237,8 +237,8 @@
             <![CDATA[ AND DATE_FORMAT(actInfo.CREATED_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         </if>
         <if test='actType != null and actType != "" and actType == "5"'>
-            <![CDATA[ AND DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
-            or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
+            <![CDATA[ AND (DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
+            or (actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}))
         </if>
         <if test='actType != null and actType != "" and actType != "5"'>
             AND (relation.STATUS = #{actType}