Merge branch 'main' of ssh://124.243.245.42:2222/zkr/shz-backend

This commit is contained in:
2026-06-25 23:13:38 +08:00
11 changed files with 61 additions and 17 deletions

View File

@@ -72,4 +72,6 @@ public interface IJobApplyService
public List<Job> selectJobApplyListJob(JobApply jobApply);
public int updateJobZphApply(JobApply jobApply);
JobApply selectByJobIdAndUserId(Long jobId, Long userId);
}

View File

@@ -160,4 +160,9 @@ public class JobApplyServiceImpl extends ServiceImpl<JobApplyMapper,JobApply> im
public int updateJobZphApply(JobApply jobApply) {
return jobApplyMapper.updateJobZphApply(jobApply);
}
@Override
public JobApply selectByJobIdAndUserId(Long jobId, Long userId) {
return jobApplyMapper.selectByJobIdAndUserId(jobId, userId);
}
}

View File

@@ -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<JobMapper,Job> implements IJobSe
private List<ESJobDocument> sysUserCollection(List<ESJobDocument> 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<Long> collectionIds = jobCollectionMapper.selectList(Wrappers.<JobCollection>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<Long> applyJobIds = new HashSet<>();
List<Job> jobList = jobApplyMapper.applyJob(SecurityUtils.getUserId());
List<Job> jobList = jobApplyMapper.applyJob(appUserId);
if (CollectionUtils.isNotEmpty(jobList)) {
applyJobIds = jobList.stream().map(Job::getJobId).collect(Collectors.toSet());
}