diff --git a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
index bbd68e9..2df9b59 100644
--- a/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
+++ b/ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java
@@ -6,8 +6,6 @@ import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
 import lombok.val;
@@ -77,8 +75,8 @@ public class OaFeedbackServiceImpl implements IOaFeedbackService {
         Map<String, Object> params = bo.getParams();
         QueryWrapper<OaFeedback> lqw = Wrappers.query();
         lqw.eq("ofi.user_id", LoginHelper.getUserId());
-        lqw.eq("oaf.project_id",bo.getProjectId());
-        lqw.like("oaf.title", bo.getTitle());
+        lqw.eq(bo.getProjectId()!= null, "oaf.project_id",bo.getProjectId());
+        lqw.like(StringUtils.isNotBlank(bo.getTitle()), "oaf.title", bo.getTitle());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_name", bo.getProjectName());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_code", bo.getProjectName());
         lqw.like(StringUtils.isNotBlank(bo.getProjectName()), "sop.project_num", bo.getProjectName());