Merge remote-tracking branch 'origin/dev' into prod

yd-product-feign/src/main/java/com/yd/product/feign/request/productlaunch/ApiProductLaunchPageRequest.java

@@ -4,6 +4,7 @@ import com.yd.common.dto.PageDto;
 import lombok.Data;
 import lombok.Data;
 
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 
 @Data
 @Data
 public class ApiProductLaunchPageRequest extends PageDto {
 public class ApiProductLaunchPageRequest extends PageDto {
@@ -18,4 +19,8 @@ public class ApiProductLaunchPageRequest extends PageDto {
      */
      */
     private String title;
     private String title;
 
 
+    /**
+     * 标题列表（多个）
+     */
+    private List<String> titleList;
 }
 }

yd-product-service/src/main/resources/mappers/ProductLaunchMapper.xml

@@ -16,6 +16,12 @@
             <if test="request.title != null and request.title != ''">
             <if test="request.title != null and request.title != ''">
                 and pl.title like concat('%', #{request.title}, '%')
                 and pl.title like concat('%', #{request.title}, '%')
             </if>
             </if>
+            <if test="request.titleList != null and request.titleList.size > 0">
+                and pl.title in
+                <foreach collection="request.titleList" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             and pl.is_deleted = 0
             and pl.is_deleted = 0
         </where>
         </where>