From ef7bb6b3645b06ffa96c870a4f71c0cde67fe228 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 3 Aug 2020 17:37:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=9B=9E=E9=A1=BE=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              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 046267b067..532a1ec5b2 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
@@ -348,10 +348,12 @@
             i.ACT_ADDRESS actAddress,
             'finished' actCurrentState
         FROM act_info i
+        LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
         WHERE i.DEL_FLAG = '0'
-        AND i.SUMMARY_FLAG = 1 OR (SELECT r.ACT_ID FROM act_live_rec r WHERE r.DEL_FLAG = '0' AND r.ACT_ID = i.ID GROUP BY r.ACT_ID)
+        AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS = 'finished'
+        GROUP BY r.ACT_ID
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>
@@ -711,10 +713,12 @@
             i.ACT_ADDRESS actAddress,
             'finished' actCurrentState
         FROM act_info i
+        LEFT JOIN act_live_rec r ON r.ACT_ID = i.ID AND r.DEL_FLAG = '0'
         WHERE i.DEL_FLAG = '0'
-        AND i.SUMMARY_FLAG = 1 OR (SELECT r.ACT_ID FROM act_live_rec r WHERE r.DEL_FLAG = '0' AND r.ACT_ID = i.ID GROUP BY r.ACT_ID)
+        AND i.SUMMARY_FLAG = 1 OR r.ID is NOT NULL
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS = 'finished'
+        GROUP BY r.ACT_ID
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}
     </select>