From 8e4c6e07ec67661f23a92222307c5b6134d62605 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 26 Oct 2023 18:43:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=202.4.0=201.=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2jobName=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easy/retry/server/web/service/impl/JobServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java index 6b5f8f95..19006818 100644 --- a/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java +++ b/easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java @@ -59,13 +59,14 @@ public class JobServiceImpl implements JobService { } if (StrUtil.isNotBlank(queryVO.getJobName())) { - queryWrapper.like(Job::getJobName, "%" + queryVO.getJobName().trim() + "%"); + queryWrapper.like(Job::getJobName, queryVO.getJobName().trim() + "%"); } if (Objects.nonNull(queryVO.getJobStatus())) { queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus()); } + queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); queryWrapper.orderByDesc(Job::getId); PageDTO selectPage = jobMapper.selectPage(pageDTO, queryWrapper); @@ -106,13 +107,14 @@ public class JobServiceImpl implements JobService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper() .select(Job::getId, Job::getJobName); if (StrUtil.isNotBlank(keywords)) { - queryWrapper.like(Job::getJobName, "%" + keywords.trim() + "%"); + queryWrapper.like(Job::getJobName, keywords.trim() + "%"); } if (Objects.nonNull(jobId)) { queryWrapper.eq(Job::getId, jobId); } + queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus()); PageDTO pageDTO = new PageDTO<>(1, 20); PageDTO selectPage = jobMapper.selectPage(pageDTO, queryWrapper); return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());