From 26912baa66d632ceb7643897930654373db5fa37 Mon Sep 17 00:00:00 2001 From: JR <3573153686@qq.com> Date: Mon, 18 Aug 2025 15:04:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(oa):=20=E4=BC=98=E5=8C=96=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了不必要的导入语句 - 修改了项目 ID 和标题的查询条件，增加了非空判断 - 优化了查询参数的处理，提高了查询的准确性和效率 --- .../com/ruoyi/oa/service/impl/OaFeedbackServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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 params = bo.getParams(); QueryWrapper 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());