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());