diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java index ae0003b..62b6633 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppJobController.java @@ -151,6 +151,9 @@ public class AppJobController extends BaseController @GetMapping(value = "/{jobId}") public AjaxResult getInfo(@PathVariable("jobId") Long jobId, HttpServletRequest request) { + if (jobId == null) { + return AjaxResult.error("jobId不能为空"); + } //Job job = jobService.selectJobByJobIdApp(jobId); Job job = jobService.selectHttpJobByJobIdApp(jobId,request); return success(job); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java index 69e6a80..6b29ff4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsJobController.java @@ -87,6 +87,9 @@ public class CmsJobController extends BaseController @GetMapping(value = "/{jobId}") public AjaxResult getInfo(@PathVariable("jobId") Long jobId, HttpServletRequest request) { + if (jobId == null) { + return AjaxResult.error("jobId不能为空"); + } //return success(jobService.selectJobByJobId(jobId)); return success(jobService.selectHttpJobByJobId(jobId,request)); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java index 00db680..e1a9b38 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java @@ -239,12 +239,10 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe job.setCompany(company); } //查询联系人 - JobContact contact=new JobContact(); - contact.setJobId(job.getJobId()); - List contacts=jobContactMapper.getSelectList(contact); - if(contacts!=null){ - job.setJobContactList(contacts); - } + JobContact contact = new JobContact(); + contact.setJobId(jobId); + List contacts = jobContactMapper.getSelectList(contact); + job.setJobContactList(contacts == null ? Collections.emptyList() : contacts); //查询附件 String baseFilePath = StringUtil.getFilePath(request); //查询附件 @@ -566,9 +564,13 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe appReviewJobMapper.insert(appReviewJob); } this.view(jobId); + //查询联系人 + JobContact contact = new JobContact(); + contact.setJobId(jobId); + List contacts = jobContactMapper.getSelectList(contact); + job.setJobContactList(contacts == null ? Collections.emptyList() : contacts); //查询附件 String baseFilePath = StringUtil.getFilePath(request); - //查询附件 File queryFile = new File(); queryFile.setBussinessid(jobId); List filesList = Optional.ofNullable(fileMapper.selectFileList(queryFile))