GTsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 2.4.0

Browse Source 
1. 修复查询jobName没有过滤删除的数据
This commit is contained in:
byteblogs168 2023-10-26 18:43:02 +08:00
parent aedaeb25f3
commit 8e4c6e07ec
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
easy-retry-server/easy-retry-server-web/src/main/java/com/aizuda/easy/retry/server/web/service/impl/JobServiceImpl.java
View File

@ -59,13 +59,14 @@ public class JobServiceImpl implements JobService {
} }
if (StrUtil.isNotBlank(queryVO.getJobName())) { if (StrUtil.isNotBlank(queryVO.getJobName())) {
queryWrapper.like(Job::getJobName, "%" + queryVO.getJobName().trim() + "%"); queryWrapper.like(Job::getJobName, queryVO.getJobName().trim() + "%");
} }
if (Objects.nonNull(queryVO.getJobStatus())) { if (Objects.nonNull(queryVO.getJobStatus())) {
queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus()); queryWrapper.eq(Job::getJobStatus, queryVO.getJobStatus());
} }
queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus());
queryWrapper.orderByDesc(Job::getId); queryWrapper.orderByDesc(Job::getId);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper); PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
@ -106,13 +107,14 @@ public class JobServiceImpl implements JobService {
LambdaQueryWrapper<Job> queryWrapper = new LambdaQueryWrapper<Job>() LambdaQueryWrapper<Job> queryWrapper = new LambdaQueryWrapper<Job>()
.select(Job::getId, Job::getJobName); .select(Job::getId, Job::getJobName);
if (StrUtil.isNotBlank(keywords)) { if (StrUtil.isNotBlank(keywords)) {
queryWrapper.like(Job::getJobName, "%" + keywords.trim() + "%"); queryWrapper.like(Job::getJobName, keywords.trim() + "%");
} }
if (Objects.nonNull(jobId)) { if (Objects.nonNull(jobId)) {
queryWrapper.eq(Job::getId, jobId); queryWrapper.eq(Job::getId, jobId);
} }
queryWrapper.eq(Job::getDeleted, StatusEnum.YES.getStatus());
PageDTO<Job> pageDTO = new PageDTO<>(1, 20); PageDTO<Job> pageDTO = new PageDTO<>(1, 20);
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper); PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO, queryWrapper);
return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords()); return JobResponseVOConverter.INSTANCE.toJobResponseVOs(selectPage.getRecords());