From 4328d5d30c04e83b1b206a16afb1846a3aa75129 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Wed, 5 Feb 2020 10:37:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=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 db7ca04fd..2fcd17b86 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
@@ -331,7 +331,7 @@
         when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> #{timestamp}
         and
         <![CDATA[ DATE_FORMAT(actInfo.SIGNUP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> #{timestamp}
-        then '3'
+        then IF( relation.STATUS NOT IN ( '3', '4' ) AND relation.STATUS IS NOT NULL, '1', '3' )
         when <![CDATA[ DATE_FORMAT(actInfo.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> #{timestamp}
         and
         <![CDATA[ DATE_FORMAT(actInfo.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> #{timestamp}