diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java index e1e61cd..98705c2 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java @@ -49,7 +49,6 @@ public class CompanyJobLive extends BaseEntity @ApiModelProperty("结束时间") private String endTime; - @ApiModelProperty("公司ID") private Long companyId; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java index 8471214..dcb855d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java @@ -64,6 +64,6 @@ public class CompanyJobLiveServiceImpl implements ICompanyJobLiveService { LoginUser logUser = SecurityUtils.getLoginUser(); SysUser sysUser = logUser.getUser(); Company company = companyService.queryCodeCompany(sysUser.getIdCard()); - return company.getCompanyId(); + return company != null ? company.getCompanyId() : null; } } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java index b3b9aa4..8e244df 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java @@ -153,7 +153,11 @@ public class JobApplyServiceImpl extends ServiceImpl im @Override public List selectJobApplyListJob(JobApply jobApply) { - return jobApplyMapper.selectJobApplyListJob(jobApply); + List jobList = jobApplyMapper.selectJobApplyListJob(jobApply); + jobList.forEach(job -> { + job.setIsApply(1); + }); + return jobList; } @Override