From a7fdc5fe76b62500a1a526815fa43e26335b2584 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 7 Feb 2020 18:59:04 +0800
Subject: [PATCH] =?UTF-8?q?sql=20=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/activity/ActInfoDao.xml           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 12db52360..fc6c35fdd 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
@@ -245,7 +245,7 @@
         </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}
-            || actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
+            or actInfo.ACT_STATUS = '0' and relation.USER_ID = #{userId}
         </if>
         <if test='actType != null and actType != "" and actType != "5"'>
             AND relation.STATUS = #{actType}