Merge remote-tracking branch 'origin/dev_heart' into dev

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -178,7 +178,7 @@
         LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND U.DEL_FLAG = '0' AND  u.`STATUS` != 'refused' AND u.`STATUS` != 'canceled' AND u.USER_ID = #{userId}
         LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
         WHERE i.DEL_FLAG = '0'
-        AND i.ACT_STATUS = 'finished'
+        AND i.ACT_STATUS != 'published'
         AND i.CUSTOMER_ID = #{customerId}
         ORDER BY i.ACT_STATUS DESC, i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}