From 51461eb4cad3b932714474e00cccafcf9af93dc6 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:20:28 +0800 Subject: [PATCH 1/2] update --- .../java/com/ruoyi/cms/service/impl/JobServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 2d3be86..cb54fa3 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 @@ -1097,14 +1097,13 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} - // 优先使用 App 端用户，兜底使用 PC 端用户 + //PC 端用户 Long userId = null; - if(SiteSecurityUtils.isLogin()){ - userId = SiteSecurityUtils.getUserId(); - } else if(SecurityUtils.isLogin()){ + if(SecurityUtils.isLogin()){ userId = SecurityUtils.getUserId(); } if(userId != null){ + log.error("--------userId:" + userId); //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() .eq(JobCollection::getUserId, userId) From a33b3988a54341ba40a4f43ccb9d2b4e39a386ba Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Thu, 25 Jun 2026 15:27:24 +0800 Subject: [PATCH 2/2] update --- .../com/ruoyi/cms/service/impl/JobServiceImpl.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 cb54fa3..017aa95 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 @@ -1097,20 +1097,15 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe private List sysUserCollection(List jobs){ if(jobs.isEmpty()){return new ArrayList<>();} - //PC 端用户 - Long userId = null; if(SecurityUtils.isLogin()){ - userId = SecurityUtils.getUserId(); - } - if(userId != null){ - log.error("--------userId:" + userId); + log.error("--------SecurityUtils.getUserId():" + SecurityUtils.getUserId()); //收藏 Set collectionIds = jobCollectionMapper.selectList(Wrappers.lambdaQuery() - .eq(JobCollection::getUserId, userId) + .eq(JobCollection::getUserId, SecurityUtils.getUserId()) .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(userId); + List jobList = jobApplyMapper.applyJob(SecurityUtils.getUserId()); if (CollectionUtils.isNotEmpty(jobList)) { applyJobIds = jobList.stream().map(Job::getJobId).collect(Collectors.toSet()); }