From c36395eb962c818973b2ac3c47239b7de41a8caf Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 23 Aug 2022 17:24:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/partyOrg/form/ActAndScheduleListFormDTO.java           | 2 +-
 .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml       | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java
index 03e24570ad..46ee2bdaed 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java
@@ -17,7 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable {
     private String startDate;
     private String endDate;
     private String dateId;
-    private String yearId;
+    private String yearId = "";
 
     /**
      * 是否本人创建的活动，1：是；0：否
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
index ea2a3ccb8b..2c1b07c313 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml
@@ -68,6 +68,9 @@
             <if test='null != dateId and dateId != "" '>
                 AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId}
             </if>
+            <if test='null != yearId and yearId != "" '>
+                AND DATE_FORMAT(pa.HOLD_TIME,'%Y') = #{yearId}
+            </if>
             <if test='null != type and type != "" '>
                 AND act_type = #{type}
             </if>