From a0d5cc063709b0cc578f6d3b5d9f5e4b57733683 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 26 Jun 2026 15:32:34 +0800 Subject: [PATCH 1/2] update --- .../src/main/java/com/ruoyi/cms/domain/CompanyJobLive.java | 1 - .../ruoyi/cms/service/impl/CompanyJobLiveServiceImpl.java | 2 +- .../com/ruoyi/cms/service/impl/JobApplyServiceImpl.java | 6 +++++- 3 files changed, 6 insertions(+), 3 deletions(-) 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 From 0ec82c0b4f73a69ad6cd1bbaf106f0f7b5da8d1f Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 26 Jun 2026 15:50:09 +0800 Subject: [PATCH 2/2] update --- .../app/AppUserWorkExperiencesController.java | 17 ++--------------- .../cms/UserWorkExperiencesController.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java index 430fa9f..2e5e19d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserWorkExperiencesController.java @@ -1,7 +1,5 @@ package com.ruoyi.cms.controller.app; -import com.ruoyi.cms.domain.JobApply; -import com.ruoyi.cms.service.impl.JobApplyServiceImpl; import com.ruoyi.common.core.domain.entity.UserWorkExperiences; import com.ruoyi.cms.service.UserWorkExperiencesService; import com.ruoyi.common.core.controller.BaseController; @@ -20,8 +18,8 @@ import java.util.List; /** * 用户工作经历表 * - * @author - * @email + * @author + * @email * @date 2025-10-10 16:26:26 */ @RestController @@ -32,9 +30,6 @@ public class AppUserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; - @Autowired - JobApplyServiceImpl jobApplyService; - /** * 列表 */ @@ -44,14 +39,6 @@ public class AppUserWorkExperiencesController extends BaseController { if(userWorkExperiences.getUserId()==null){ userWorkExperiences.setUserId(SiteSecurityUtils.getUserId()); } - //已读简历 - if (userWorkExperiences.getJobId() != null) { - JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId()); - if (jobApply != null) { - jobApply.setIsView("1"); - jobApplyService.updateJobApply(jobApply); - } - } startPage(); List list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences); return getDataTable(list); diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java index 7506440..806e82f 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/UserWorkExperiencesController.java @@ -1,6 +1,8 @@ package com.ruoyi.cms.controller.cms; +import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.service.IAppUserService; +import com.ruoyi.cms.service.impl.JobApplyServiceImpl; import com.ruoyi.cms.util.RoleUtils; import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.UserWorkExperiences; @@ -33,9 +35,13 @@ public class UserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; + @Autowired private IAppUserService appUserService; + @Autowired + private JobApplyServiceImpl jobApplyService; + /** * 列表 */ @@ -43,6 +49,14 @@ public class UserWorkExperiencesController extends BaseController { @PreAuthorize("@ss.hasPermi('cms:userworkexperiences:list')") @GetMapping("/list") public TableDataInfo list(UserWorkExperiences userWorkExperiences){ + //已读简历 + if (userWorkExperiences.getJobId() != null) { + JobApply jobApply = jobApplyService.selectByJobIdAndUserId(userWorkExperiences.getJobId(), userWorkExperiences.getUserId()); + if (jobApply != null) { + jobApply.setIsView("1"); + jobApplyService.updateJobApply(jobApply); + } + } startPage(); List list=userWorkExperiencesService.getWorkExperiencesList(userWorkExperiences); return getDataTable(list);