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

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>