From 3d0838756116109de7895e3be728c15a09838aa2 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 17:54:48 +0800 Subject: [PATCH 1/3] update --- .../cms/controller/app/AppUserController.java | 2 ++ .../app/AppUserWorkExperiencesController.java | 13 +++++++++++++ .../main/java/com/ruoyi/cms/domain/Job.java | 2 ++ .../java/com/ruoyi/cms/domain/JobApply.java | 3 +++ .../com/ruoyi/cms/mapper/JobApplyMapper.java | 5 ++++- .../ruoyi/cms/service/IJobApplyService.java | 2 ++ .../cms/service/impl/JobApplyServiceImpl.java | 5 +++++ .../ruoyi/cms/service/impl/JobServiceImpl.java | 16 +++++++++------- .../resources/mapper/app/JobApplyMapper.xml | 7 +++++-- .../domain/entity/UserWorkExperiences.java | 4 ++++ .../framework/web/service/SsoService.java | 18 +++++++++++------- 11 files changed, 60 insertions(+), 17 deletions(-) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java index 33942dc..e6388c8 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/app/AppUserController.java @@ -85,6 +85,8 @@ public class AppUserController extends BaseController return AjaxResult.error("用户id为空!"); } AppUser appUser = appUserService.selectAppUserByUserId(userId); + //企业查看简历，更新查看标识 + return AjaxResult.success(appUser); } 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 4978138..430fa9f 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,5 +1,7 @@ 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; @@ -30,6 +32,9 @@ public class AppUserWorkExperiencesController extends BaseController { @Autowired private UserWorkExperiencesService userWorkExperiencesService; + @Autowired + JobApplyServiceImpl jobApplyService; + /** * 列表 */ @@ -39,6 +44,14 @@ 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/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 73e7e6f..990ddeb 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -202,4 +202,6 @@ public class Job extends BaseEntity @ApiModelProperty("审核状态") private String reviewStatus; + //简历是否被查看 + private String isView; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java index d74051c..7089241 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/JobApply.java @@ -47,4 +47,7 @@ public class JobApply extends BaseEntity @TableField(exist = false) @ApiModelProperty("身份证，招聘传递") private String idCard; + + @ApiModelProperty("是否已被查看 0未查看 1已查看") + private String isView; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java index 3166570..6927d6d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/mapper/JobApplyMapper.java @@ -9,6 +9,7 @@ import com.ruoyi.cms.domain.Job; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.vo.CandidateVO; import com.ruoyi.common.core.domain.entity.AppUser; +import org.apache.ibatis.annotations.Param; /** * 岗位申请Mapper接口 @@ -38,5 +39,7 @@ public interface JobApplyMapper extends BaseMapper List selectJobApplyListJob(JobApply jobApply); - public int updateJobZphApply(JobApply jobApply); + int updateJobZphApply(JobApply jobApply); + + JobApply selectByJobIdAndUserId(@Param("jobId") Long jobId, @Param("userId") Long userId); } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java index e1f4ae7..51c5bd4 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IJobApplyService.java @@ -72,4 +72,6 @@ public interface IJobApplyService public List selectJobApplyListJob(JobApply jobApply); public int updateJobZphApply(JobApply jobApply); + + JobApply selectByJobIdAndUserId(Long jobId, Long userId); } 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 317f88f..b3b9aa4 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 @@ -160,4 +160,9 @@ public class JobApplyServiceImpl extends ServiceImpl im public int updateJobZphApply(JobApply jobApply) { return jobApplyMapper.updateJobZphApply(jobApply); } + + @Override + public JobApply selectByJobIdAndUserId(Long jobId, Long userId) { + return jobApplyMapper.selectByJobIdAndUserId(jobId, userId); + } } 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 017aa95..11c3195 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 @@ -21,10 +21,7 @@ import com.ruoyi.cms.util.notice.NoticeUtils; import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.constant.Constants; import com.ruoyi.common.core.domain.TreeSelect; -import com.ruoyi.common.core.domain.entity.AppUser; -import com.ruoyi.common.core.domain.entity.Company; -import com.ruoyi.common.core.domain.entity.File; -import com.ruoyi.common.core.domain.entity.JobTitle; +import com.ruoyi.common.core.domain.entity.*; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; @@ -1098,14 +1095,19 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} if(SecurityUtils.isLogin()){ - log.error("--------SecurityUtils.getUserId():" + SecurityUtils.getUserId()); + SysUser sysUser = SecurityUtils.getLoginUser().getUser(); + Long appUserId = sysUser.getAppUserId(); + if (appUserId == null) { + return jobs; + } + log.error("--------sysUserCollection.SysUser.appUserId:" + appUserId); //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() - .eq(JobCollection::getUserId, SecurityUtils.getUserId()) + .eq(JobCollection::getUserId, appUserId) .in(JobCollection::getJobId, jobs.stream().map(ESJobDocument::getJobId).collect(Collectors.toList()))) .stream().map(JobCollection::getJobId).collect(Collectors.toSet()); Set applyJobIds = new HashSet<>(); - List jobList = jobApplyMapper.applyJob(SecurityUtils.getUserId()); + List jobList = jobApplyMapper.applyJob(appUserId); if (CollectionUtils.isNotEmpty(jobList)) { applyJobIds = jobList.stream().map(Job::getJobId).collect(Collectors.toSet()); } diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index c0a28c2..67e4c25 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -32,7 +32,7 @@ + select * from job_apply where del_flag=0 and job_id=#{jobId} and user_id=#{userId} + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java index d91c76b..0f4491d 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/UserWorkExperiences.java @@ -60,4 +60,8 @@ public class UserWorkExperiences extends BaseEntity { @ApiModelProperty("描述") private String description; + @TableField(exist = false) + @ApiModelProperty("岗位ID") + private Long jobId; + } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java index 33dc605..11ffaf6 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SsoService.java @@ -316,12 +316,16 @@ public class SsoService { //取角色判断是网格员2，还是内部工作者3 String isCompanyUser = null; if(userJson.containsKey("roles")) { - JSONObject role = userJson.getJSONArray("roles").getJSONObject(0); - if (role != null && role.containsKey("roleId")) { - /*1101(求职者)、1102(招聘者)、1103(网格员)、1104(内部工作者)*/ - Long roleId = role.getLong("roleId"); - if (roleId != null && roleId.equals(1103L)) { - isCompanyUser = "2";//2网格员 + JSONArray role = userJson.getJSONArray("roles"); + if (role != null && role.size() != 0) { + for (int i=0;i Date: Thu, 25 Jun 2026 18:25:06 +0800 Subject: [PATCH 2/3] update --- ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java | 1 + 1 file changed, 1 insertion(+) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java index 990ddeb..8acf763 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/domain/Job.java @@ -203,5 +203,6 @@ public class Job extends BaseEntity @ApiModelProperty("审核状态") private String reviewStatus; //简历是否被查看 + @TableField(exist = false) private String isView; } From 5c7c9d27bc1769329b4757239b6a20c87dab04a3 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 18:31:21 +0800 Subject: [PATCH 3/3] update --- .../src/main/resources/mapper/app/JobApplyMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml index 67e4c25..6e9584f 100644 --- a/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml +++ b/ruoyi-bussiness/src/main/resources/mapper/app/JobApplyMapper.xml @@ -163,6 +163,6 @@ \ No newline at end of file