From a637ff1b144bd9c2ce6c82242ca29b27a6a5fd9b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 31 Jul 2020 09:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=88=91=E7=9A=84=E3=80=91=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8sql=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/ActInfoDao.xml         | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index ebbb774d7e..a2b4d9ad62 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -199,9 +199,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'auditing' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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 u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'auditing'
         ORDER BY i.CREATED_TIME DESC
@@ -222,9 +223,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'passed' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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 u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'passed'
         ORDER BY i.CREATED_TIME DESC
@@ -245,9 +247,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'refused' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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 u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND u.`STATUS` = 'refused'
         ORDER BY i.CREATED_TIME DESC
@@ -268,9 +271,10 @@
             i.ACT_QUOTA actQuota,
             IFNULL(c.signupNum, 0) signupNum, 	-- 已报名人数
             'canceld' AS actCurrentState -- 活动状态
-        FROM act_info i LEFT JOIN act_user_relation u ON i.ID = u.ACT_ID AND u.DEL_FLAG = '0'
+        FROM act_user_relation u LEFT JOIN act_info i  ON i.ID = u.ACT_ID
         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 u.DEL_FLAG = '0'
         AND u.USER_ID = #{userId}
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() -- 活动结束时间 &lt; 当前时间, 活动已结束
         ORDER BY i.CREATED_TIME DESC