diff --git a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java index 2c3fd07c..aaa3a9f1 100644 --- a/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java +++ b/powerjob-server/powerjob-server-starter/src/main/java/tech/powerjob/server/web/controller/JobController.java @@ -88,23 +88,27 @@ public class JobController { if (request.getJobId() != null) { Optional jobInfoOpt = jobInfoRepository.findById(request.getJobId()); - if (!jobInfoOpt.get().getAppId().equals(request.getAppId())){ - return ResultDTO.failed("请输入该app下的jobId"); - } - PageResult result = new PageResult<>(); - result.setIndex(0); - result.setPageSize(request.getPageSize()); - if (jobInfoOpt.isPresent()) { - result.setTotalItems(1); - result.setTotalPages(1); - result.setData(Lists.newArrayList(JobInfoVO.from(jobInfoOpt.get()))); - } else { + PageResult result = new PageResult<>(); + + if (!jobInfoOpt.isPresent()) { result.setTotalPages(0); result.setTotalItems(0); result.setData(Lists.newLinkedList()); + return ResultDTO.success(result); } + if (!jobInfoOpt.get().getAppId().equals(request.getAppId())){ + return ResultDTO.failed("请输入该app下的jobId"); + } + + result.setIndex(0); + result.setPageSize(request.getPageSize()); + + result.setTotalItems(1); + result.setTotalPages(1); + result.setData(Lists.newArrayList(JobInfoVO.from(jobInfoOpt.get()))); + return ResultDTO.success(result); }