Merge remote-tracking branch 'origin/dev_zxm' into test

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailTaskRecipientsPageRequest.java

@@ -3,10 +3,18 @@ package com.yd.email.feign.request;
 import com.yd.common.dto.PageDto;
 import com.yd.common.dto.PageDto;
 import lombok.Data;
 import lombok.Data;
 
 
+import javax.validation.constraints.NotBlank;
+
 @Data
 @Data
 public class ApiEmailTaskRecipientsPageRequest extends PageDto {
 public class ApiEmailTaskRecipientsPageRequest extends PageDto {
 
 
     /**
     /**
+     * 邮件任务唯一业务ID
+     */
+    @NotBlank(message = "邮件任务唯一业务ID不能为空")
+    private String taskBizId;
+
+    /**
      * 收件人邮箱
      * 收件人邮箱
      */
      */
     private String receiveEmail;
     private String receiveEmail;

yd-email-service/src/main/resources/mappers/EmailTaskRecipientsMapper.xml

@@ -14,7 +14,7 @@
                 and etr.status = #{request.status}
                 and etr.status = #{request.status}
             </if>
             </if>
 
 
-            and etr.is_deleted = 0
+            and etr.task_biz_id = #{request.taskBizId} and etr.is_deleted = 0
         </where>
         </where>
     </select>
     </select>
 </mapper>
 </mapper>