zkr/shz-dataDashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新：1.获取用户信息返回用户类型；2.政策列表处理政策标签；3.岗位列表添加查询条件等。

Browse Source
This commit is contained in:
chenyanchang
2026-06-12 15:49:57 +08:00
parent f95981ed08
commit 27f3dc4730
4 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/ESJobSearchImpl.java
View File

@@ -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<ESJobDocument> wrapper = getWrapper(newSearch,jobIds);

7
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/JobServiceImpl.java
View File

@@ -1083,10 +1083,17 @@ public class JobServiceImpl extends ServiceImpl<JobMapper,Job> 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<Long> applyJobIds = new HashSet<>();
List<Job> 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;

4
ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/policy/impl/PolicyInfoServiceImpl.java
View File

@@ -61,6 +61,10 @@ public class PolicyInfoServiceImpl implements IPolicyInfoService {
@Override
public List<PolicyInfo> selectList(PolicyInfoQuery query) {
if (StringUtils.isNotEmpty(query.getPolicyTag())) {
List<String> policyTags = Arrays.asList(query.getPolicyTag().split(","));
query.setPolicyTags(policyTags);
}
return policyInfoMapper.selectPolicyInfoList(query);
}