diff --git a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java index 5fa4425..d7a5799 100644 --- a/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java +++ b/src/main/java/net/geedge/asw/module/runner/service/impl/JobServiceImpl.java @@ -64,6 +64,13 @@ public class JobServiceImpl extends ServiceImpl implements IJ PackageEntity pkg = packageService.getById(job.getPackageId()); job.setPkg(pkg); + + if (-1 == job.getStartTimestamp()) { + job.setStartTimestamp(null); + } + if (-1 == job.getEndTimestamp()) { + job.setEndTimestamp(null); + } return job; } @@ -71,6 +78,14 @@ public class JobServiceImpl extends ServiceImpl implements IJ public Page queryList(Map params) { Page page = new Query(JobEntity.class).getPage(params); List jobList = this.getBaseMapper().queryList(page, params); + jobList.stream().forEach(jobEntity -> { + if (-1 == jobEntity.getStartTimestamp()) { + jobEntity.setStartTimestamp(null); + } + if (-1 == jobEntity.getEndTimestamp()) { + jobEntity.setEndTimestamp(null); + } + }); page.setRecords(jobList); return page; }