diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
index 5393a34..d10a01a 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalProjectExecutor.java
@@ -181,10 +181,9 @@ public class EvalProjectExecutor implements EvalProjectApi {
 
     @Override
     public PageResponse<RiskWarningCO> riskWarningPage(RiskWarningPageQuery query) {
-        EvalProjectQuery domainQuery = new EvalProjectQuery();
-        domainQuery.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
+        query.setOrgId(ThreadLocalUserInfoAdapter.getOrgId());
         Page<RiskWarningCO> page = new Page<>( query.getCurrent(),  query.getSize());
-        IPage<RiskWarningCO> result = evalProjectMapper.selectRiskWarningPage(page, domainQuery);
+        IPage<RiskWarningCO> result = evalProjectMapper.selectRiskWarningPage(page, query);
         return PageResponse.of(result.getRecords(), result.getTotal());
     }
 
diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/RiskWarningPageQuery.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/RiskWarningPageQuery.java
index 2501bb8..ea6b9cc 100644
--- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/RiskWarningPageQuery.java
+++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/dto/institution/RiskWarningPageQuery.java
@@ -18,6 +18,9 @@ public class RiskWarningPageQuery extends BasePageQuery {
     @ApiModelProperty("风险等级：HIGH高风险 MIDDLE中风险 LOW低风险")
     private String riskLevel;
 
+    @ApiModelProperty(hidden = true)
+    private Long orgId;
+
     @ApiModelProperty("预警类型：PROGRESS进度 CYCLE周期 QUALITY质量 PERSONNEL人员 ARCHIVE归档")
     private String warningType;
 }
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalProjectMapper.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalProjectMapper.java
index a250f79..7678efd 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalProjectMapper.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/mapper/EvalProjectMapper.java
@@ -13,6 +13,7 @@ import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectMonitorStatC
 import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyPageCO;
 import org.qinan.safetyeval.client.co.regulator.RegulatorEvalProjectSurveyStatCO;
 import org.qinan.safetyeval.client.co.regulator.RegulatorEvalSurveyClockInCO;
+import org.qinan.safetyeval.client.dto.institution.RiskWarningPageQuery;
 import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectMonitorRealtimePageQuery;
 import org.qinan.safetyeval.client.dto.regulator.RegulatorEvalProjectSurveyPageQuery;
 import org.qinan.safetyeval.domain.query.EvalProjectQuery;
@@ -34,7 +35,7 @@ public interface EvalProjectMapper extends BaseMapper<EvalProjectDO> {
     /**
      * 风险预警管理分页查询（暂只查项目编号、项目/客户、责任人）
      */
-    IPage<RiskWarningCO> selectRiskWarningPage(Page<RiskWarningCO> page, @Param("query") EvalProjectQuery query);
+    IPage<RiskWarningCO> selectRiskWarningPage(Page<RiskWarningCO> page, @Param("query") RiskWarningPageQuery query);
 
     long onSiteTaskSum(@Param("pIds") List<Long> pIds, @Param("val") String val);
 
diff --git a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml
index 8952c52..bbabc7d 100644
--- a/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml
+++ b/safety-eval-infrastructure/src/main/resources/mapper/EvalProjectMapper.xml
@@ -60,6 +60,10 @@
         <if test="query.orgId != null">
             AND p.org_id = #{query.orgId}
         </if>
+        <if test="query.projectOrCustomer != null and query.projectOrCustomer != ''">
+            AND (p.project_name LIKE CONCAT('%', #{query.projectOrCustomer}, '%')
+            OR c.customer_name LIKE CONCAT('%', #{query.projectOrCustomer}, '%'))
+        </if>
         ORDER BY p.id DESC
     </select>
     <select id="onSiteTaskSum" resultType="java.lang.Long">