diff --git a/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
index b5d8a522..8834ed2a 100644
--- a/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
+++ b/src/main/java/com/glxp/api/req/purchase/FilterCertRemindMsgRequest.java
@@ -37,4 +37,14 @@ public class FilterCertRemindMsgRequest extends ListPageRequest {
     // 证书名称
     private String certName;
 
+    /**
+     * 供应商/配送商 名称
+     */
+    private String supName;
+
+    /**
+     * 预警类型
+     */
+    private String warnType;
+
 }
diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
index 065cc6f7..fc45f609 100644
--- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml
@@ -16,6 +16,12 @@
             <if test="name != null and name != ''">
                 AND c.companyName like concat('%', #{name}, '%')
             </if>
+            <if test="supName != null and supName != ''">
+                AND c.companyName like concat('%', #{supName}, '%')
+            </if>
+            <if test="warnType != null">
+                AND m.warnType = #{warnType}
+            </if>
             <if test="status != null">
                 AND m.status = #{status}
             </if>
@@ -39,10 +45,11 @@
                c.customerId                                                                                  supId,
                (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName
                 ,
-               (select name from basic_corp where erpId = c.customerId)                                      supName
+        basic_corp.name                                  supName
         from sup_cert_remind_msg m
                      left join sup_manufacturer c on m.idFk = c.manufacturerId
                      left join sup_cert bc on bc.code = m.code
+                     left join basic_corp  on basic_corp.erpId =  c.customerId
         <where>
             <if test="supId != null and supId != ''">
                 AND c.customerId = #{supId}
@@ -50,6 +57,12 @@
             <if test="name != null and name != ''">
                 AND c.companyName like concat('%', #{name}, '%')
             </if>
+            <if test="supName != null and supName != ''">
+                AND basic_corp.name like concat('%', #{supName}, '%')
+            </if>
+            <if test="warnType != null">
+                AND m.warnType = #{warnType}
+            </if>
             <if test="status != null">
                 AND m.status = #{status}
             </if>
@@ -73,12 +86,13 @@
                c.manufacturerIdFk,
                c.customerId                                                                             supId,
                (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk limit 1) certName,
-               (select name from basic_corp where erpId = c.customerId)                                 supName
+        basic_corp.name                           supName
 
 
         from sup_cert_remind_msg m
                      left join sup_product c on m.idFk = c.productId
                      left join sup_cert bc on bc.code = m.code
+        left join basic_corp  on basic_corp.erpId =  c.customerId
 
         <where>
             <if test="supId != null and supId != ''">
@@ -87,6 +101,12 @@
             <if test="name != null and name != ''">
                 AND c.recordProductName like concat('%', #{name}, '%')
             </if>
+            <if test="supName != null and supName != ''">
+                AND basic_corp.name like concat('%', #{supName}, '%')
+            </if>
+            <if test="warnType != null">
+                AND m.warnType = #{warnType}
+            </if>
             <if test="status != null">
                 AND m.status = #{status}
             </if>