修改活动判断条件

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