From 9a1ad9b2d351e7927a5f6ea50ef152e1516ed3a1 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 23 Jun 2020 13:28:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
index f29fb9e..9f47e7c 100644
--- a/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
+++ b/epdc-cloud-property/src/main/resources/mapper/activity/ActivityInfoDao.xml
@@ -73,11 +73,11 @@
         WHERE
         DEL_FLAG = '0'
         AND ACT_STATUS = '1'
-        <if test="activityState == '0'">
+        <if test="activityState == '0' or activityState == 0">
             AND ACT_START_TIME &lt;= NOW()
             AND ACT_END_TIME &gt;= NOW()
         </if>
-        <if test="activityState == '1'">
+        <if test="activityState == '1' or activityState == 1">
             AND ACT_END_TIME &lt;= NOW()
         </if>
         ORDER BY CREATED_TIME DESC