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

feat:(1.3.0-beta1): 1.优化job负责人筛选

Browse Source
This commit is contained in:
opensnail 2024-12-28 11:30:15 +08:00
parent 3129dcb0dc
commit cf97c194c3
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java
View File

@ -15,6 +15,6 @@ public class JobQueryVO extends BaseQueryVO {
private String groupName;
private String jobName;
private Integer jobStatus;
private String owerName;
private String ownerId;
private String executorInfo;
}

12
snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java
View File

@ -91,16 +91,6 @@ public class JobServiceImpl implements JobService {
UserSessionVO userSessionVO = UserSessionUtils.currentUserSession();
List<String> groupNames = UserSessionUtils.getGroupNames(queryVO.getGroupName());
Set<Long> ownerIds = systemUserMapper.selectList(new LambdaQueryWrapper<SystemUser>()
.select(SystemUser::getId)
.likeRight(SystemUser::getUsername, queryVO.getOwerName()))
.stream()
.map(i -> i.getId())
.collect(Collectors.toSet());
if (CollUtil.isEmpty(ownerIds) && StrUtil.isNotBlank(queryVO.getOwerName())) {
return new PageResult<>(pageDTO, Lists.newArrayList());
}
PageDTO<Job> selectPage = jobMapper.selectPage(pageDTO,
new LambdaQueryWrapper<Job>()
.eq(Job::getNamespaceId, userSessionVO.getNamespaceId())
@ -110,7 +100,7 @@ public class JobServiceImpl implements JobService {
StrUtil.trim(queryVO.getExecutorInfo()))
.eq(Objects.nonNull(queryVO.getJobStatus()), Job::getJobStatus, queryVO.getJobStatus())
.eq(Job::getDeleted, StatusEnum.NO.getStatus())
.in(CollUtil.isNotEmpty(ownerIds), Job::getOwnerId, ownerIds)
.eq(Objects.nonNull(queryVO.getOwnerId()), Job::getOwnerId, queryVO.getOwnerId())
.orderByDesc(Job::getId));
List<JobResponseVO> jobResponseList = JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords());