1.修改推荐岗位时,es查询角色时企业时,排除jobIds,企业用户则不排除
2.添加企业联系人新增和修改问题
This commit is contained in:
@@ -14,5 +14,7 @@ import java.util.List;
|
||||
public interface CompanyContactService {
|
||||
|
||||
List<CompanyContact> getSelectList(CompanyContact companyContact);
|
||||
|
||||
int insertUpadteCompanyContact(List<CompanyContact> list);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,9 +5,13 @@ import com.ruoyi.cms.mapper.CompanyContactMapper;
|
||||
import com.ruoyi.cms.service.CompanyContactService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import java.util.List;
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
|
||||
@Service
|
||||
@@ -19,4 +23,20 @@ public class CompanyContactServiceImpl extends ServiceImpl<CompanyContactMapper,
|
||||
public List<CompanyContact> getSelectList(CompanyContact companyContact){
|
||||
return companyContactMapper.getSelectList(companyContact);
|
||||
}
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public int insertUpadteCompanyContact(List<CompanyContact> list) {
|
||||
Map<Boolean, List<CompanyContact>> partitioned = list.stream()
|
||||
.collect(Collectors.partitioningBy(it -> it.getId() != null));
|
||||
List<CompanyContact> add=partitioned.get(false);
|
||||
List<CompanyContact> udp=partitioned.get(true);
|
||||
if(add.size()>0){
|
||||
companyContactMapper.batchInsert(add);
|
||||
}
|
||||
if(udp.size()>0){
|
||||
companyContactMapper.batchUpdate(udp);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ import com.ruoyi.cms.service.IESJobSearchService;
|
||||
import com.ruoyi.cms.util.ListUtil;
|
||||
import com.ruoyi.cms.util.StringUtil;
|
||||
import com.ruoyi.common.core.domain.entity.Company;
|
||||
import com.ruoyi.common.core.domain.model.LoginSiteUser;
|
||||
import com.ruoyi.common.core.text.Convert;
|
||||
import com.ruoyi.common.utils.SiteSecurityUtils;
|
||||
import com.ruoyi.common.utils.bean.BeanUtils;
|
||||
@@ -438,7 +439,14 @@ public class ESJobSearchImpl implements IESJobSearchService
|
||||
wrapper.orderByDesc(ESJobDocument::getMaxSalary);
|
||||
}
|
||||
}
|
||||
if(!ListUtil.isListEmptyOrNull(jobIds)){
|
||||
//企业用户排除es去除jobIds
|
||||
boolean needExclude = true;
|
||||
if (SiteSecurityUtils.isLogin()) {
|
||||
LoginSiteUser siteUser = SiteSecurityUtils.getLoginSiteUser();
|
||||
AppUser appUser = siteUser.getUser();
|
||||
needExclude = !StringUtil.IS_COMPANY_USER.equals(appUser.getIsCompanyUser());
|
||||
}
|
||||
if(needExclude && !ListUtil.isListEmptyOrNull(jobIds)){
|
||||
wrapper.not().in(ESJobDocument::getJobId, jobIds);
|
||||
}
|
||||
return wrapper;
|
||||
|
||||
Reference in New Issue
Block a user