diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java index baf542482..fe6ee68c2 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/model/request/JobQueryVO.java @@ -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; } diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java index b42388da6..2ad7f334d 100644 --- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java +++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/service/impl/JobServiceImpl.java @@ -91,16 +91,6 @@ public class JobServiceImpl implements JobService { UserSessionVO userSessionVO = UserSessionUtils.currentUserSession(); List groupNames = UserSessionUtils.getGroupNames(queryVO.getGroupName()); - Set ownerIds = systemUserMapper.selectList(new LambdaQueryWrapper() - .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 selectPage = jobMapper.selectPage(pageDTO, new LambdaQueryWrapper() .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 jobResponseList = JobResponseVOConverter.INSTANCE.convertList(selectPage.getRecords());