From b4f25ef2b000ca65a94ca38f3e220f685c156443 Mon Sep 17 00:00:00 2001
From: Bill <771989711@qq.com>
Date: Mon, 9 Oct 2023 09:42:06 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E6=A0=B9=E6=8D=AE=E7=A4=BE=E5=8C=BAID=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E6=9C=80=E6=96=B0=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/form/resi/ResiLatestActFormDTO.java   | 5 +++++
 .../src/main/resources/mapper/ActInfoDao.xml                 | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/code/smart-community/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiLatestActFormDTO.java b/code/smart-community/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiLatestActFormDTO.java
index 0f9af626..eeda5c92 100644
--- a/code/smart-community/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiLatestActFormDTO.java
+++ b/code/smart-community/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiLatestActFormDTO.java
@@ -49,6 +49,11 @@ public class ResiLatestActFormDTO implements Serializable {
     @NotBlank(message = "客户Id不能为空", groups = { AddUserInternalGroup.class })
     private String customerId;
 
+    /**
+     * 组织(社区)ID
+     */
+    private String agencyId;
+
     /**
      * 页容量，默认20页
      */
diff --git a/code/smart-community/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml b/code/smart-community/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
index 3a1358ce..42ddbcbc 100644
--- a/code/smart-community/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
+++ b/code/smart-community/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml
@@ -324,6 +324,9 @@
         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 i.CUSTOMER_ID = #{customerId}
+        <if test="agencyId != null and agencyId != ''">
+            AND i.SPONSOR_ID = #{agencyId}
+        </if>
         AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}