【初心互助】【已关闭活动查询bug】-王公峰-2020-06-02

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}