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

src/main/java/com/glxp/api/req/inv/FilterInvRemindMsgRequest.java

@@ -3,6 +3,8 @@ package com.glxp.api.req.inv;
 import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 查询库存预警消息参数
  */
@@ -59,4 +61,6 @@ public class FilterInvRemindMsgRequest extends ListPageRequest {
      */
     private String supId;
 
+    private List<String> listInv;
+
 }

src/main/resources/mybatis/mapper/inv/InvRemindMsgDao.xml

@@ -54,6 +54,13 @@
             <if test="type != null and type != ''">
                 AND type = #{type}
             </if>
+        <if test="listInv  != null and listInv.size() != 0">
+        and     irm.invCode in
+            <foreach collection="listInv" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+
+        </if>
         </where>
         order by irm.updateTime desc
     </select>