From 27f3dc4730cc96ced2ccc92b85a886f06ed6ad25 Mon Sep 17 00:00:00 2001 From: chenyanchang <30190327@qq.com> Date: Fri, 12 Jun 2026 15:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=EF=BC=9A1.=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E8=BF=94=E5=9B=9E=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=B1=BB=E5=9E=8B=EF=BC=9B2.=E6=94=BF=E7=AD=96?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A4=84=E7=90=86=E6=94=BF=E7=AD=96=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=EF=BC=9B3.=E5=B2=97=E4=BD=8D=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=AD=89?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysLoginController.java | 14 ++++++++++++++ .../ruoyi/cms/service/impl/ESJobSearchImpl.java | 6 ++++++ .../com/ruoyi/cms/service/impl/JobServiceImpl.java | 7 +++++++ .../service/policy/impl/PolicyInfoServiceImpl.java | 4 ++++ 4 files changed, 31 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java index f9d5b55..e1e383c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java @@ -5,6 +5,8 @@ import java.util.Set; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.cms.domain.IDCardInfo; +import com.ruoyi.cms.service.impl.AppUserServiceImpl; +import com.ruoyi.common.core.domain.entity.AppUser; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwTokenResult; import com.ruoyi.common.core.domain.entity.tymh.wwToken.WwUserLogin; @@ -45,6 +47,9 @@ public class SysLoginController private OauthLoginHlwService oauthLoginHlwService; @Autowired private SsoService ssoService; + + @Autowired + private AppUserServiceImpl appUserService; /** * 登录方法 * @@ -165,8 +170,17 @@ public class SysLoginController Set roles = permissionService.getRolePermission(user); // 权限集合 Set permissions = permissionService.getMenuPermission(user); + //获取相关联的appUser的用户类型 + String userType = null; + if (user != null && user.getAppUserId() != null) { + AppUser appUser = appUserService.selectAppUserByUserId(user.getAppUserId()); + if (appUser != null) { + userType = appUser.getUserType(); + } + } AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); + ajax.put("userType", userType); ajax.put("roles", roles); ajax.put("permissions", permissions); return ajax; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java index eb85bce..ef5b54d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java @@ -562,6 +562,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getJobLocation())){ wrapper.and(x->x.like(ESJobDocument::getJobLocation,esJobSearch.getJobLocation())); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyName())){ + wrapper.and(x->x.like(ESJobDocument::getCompanyName,esJobSearch.getCompanyName())); + } //按时间段来查询数据 if(esJobSearch.getStartDate() != null){ Date startDateTime = esJobSearch.getStartDate(); @@ -896,6 +899,9 @@ public class ESJobSearchImpl implements IESJobSearchService if(!StringUtil.isEmptyOrNull(esJobSearch.getCode())){ newSearch.setCode(esJobSearch.getCode()); } + if(!StringUtil.isEmptyOrNull(esJobSearch.getCompanyName())){ + newSearch.setCompanyName(esJobSearch.getCompanyName()); + } LambdaEsQueryWrapper wrapper = getWrapper(newSearch,jobIds); 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 5c121e2..a1c0d62 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 @@ -1083,10 +1083,17 @@ public class JobServiceImpl extends ServiceImpl implements IJobSe .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(SiteSecurityUtils.getUserId()); + if (CollectionUtils.isNotEmpty(jobList)) { + applyJobIds = jobApplyMapper.applyJob(SiteSecurityUtils.getUserId()).stream().map(Job::getJobId).collect(Collectors.toSet()); + } for (ESJobDocument j : jobs) { if (collectionIds.contains(j.getJobId())) { j.setIsCollection(1); } + //是否 + j.setIsApply(applyJobIds != null && applyJobIds.contains(j.getJobId()) ? 1 : 0); } } return jobs; diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java index 334490b..cc29f64 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java @@ -61,6 +61,10 @@ public class PolicyInfoServiceImpl implements IPolicyInfoService { @Override public List selectList(PolicyInfoQuery query) { + if (StringUtils.isNotEmpty(query.getPolicyTag())) { + List policyTags = Arrays.asList(query.getPolicyTag().split(",")); + query.setPolicyTags(policyTags); + } return policyInfoMapper.selectPolicyInfoList(query); }