emm

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.resi.partymember.dto.partyOrg.form;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -22,6 +23,11 @@ public class YearSearchFormDTO implements Serializable {
 
     private String type;
 
+    /**
+     * 是否本人创建的活动，1：是；0：否
+     */
+    private String isSelf = NumConstant.ONE_STR;
+
     private String staffId;
     private String customerId;
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml

@@ -80,7 +80,7 @@
             <if test='searchType == "yearSearch" '>
                 AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%')
             </if>
-            <if test=' isSelf == "1" '>
+            <if test='null != isSelf and isSelf != "" and isSelf == "1" '>
                 AND pa.PUBLISH_STAFF_ID = #{staffId}
             </if>
             <if test='null != startDate and startDate != ""'>