Merge branch 'main' of http://124.243.245.42:3000/zkr/shz-backend into main

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;
 

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;
     }
 }

ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobApplyServiceImpl.java

@@ -153,7 +153,11 @@ public class JobApplyServiceImpl extends ServiceImpl<JobApplyMapper,JobApply> im
 
     @Override
     public List<Job> selectJobApplyListJob(JobApply jobApply) {
-        return jobApplyMapper.selectJobApplyListJob(jobApply);
+        List<Job> jobList = jobApplyMapper.selectJobApplyListJob(jobApply);
+        jobList.forEach(job -> {
+            job.setIsApply(1);
+        });
+        return jobList;
     }
 
     @Override