From 6139e49c91f071b1bb907d272af12bc169571a13 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 30 Jul 2020 17:54:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=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                 | 5 +++++
 1 file changed, 5 insertions(+)

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 957e8f9dfb..ebbb774d7e 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
@@ -72,6 +72,7 @@
 		AND  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() -- 报名截止时间  >= 当前时间
         AND (i.ACT_QUOTA_CATEGORY = 0 OR i.ACT_QUOTA > IFNULL(c.signupNum, 0)) -- 不限名额或者报名人数未报满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.ACT_QUOTA_CATEGORY DESC,i.CREATED_TIME DESC
     </select>
 
@@ -99,6 +100,7 @@
         AND i.ACT_QUOTA_CATEGORY = 1   -- 固定名额
         AND i.ACT_QUOTA = IFNULL(c.signupNum, 0) -- 名额已满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -125,6 +127,7 @@
         AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -151,6 +154,7 @@
         AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -176,6 +180,7 @@
         AND i.ACT_STATUS != 'canceled'
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>