1、合并代码

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprise/EnterpriseServiceImpl.java

@@ -11,7 +11,6 @@ import com.citu.module.menduner.common.util.LoginUserContext;
 import com.citu.module.menduner.system.api.python.GraphSendDTO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseClickReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseDetailRespVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.enterprise.vo.*;
 import com.citu.module.menduner.system.controller.base.CommonRespVO;
 import com.citu.module.menduner.system.controller.base.enterprise.vo.*;
@@ -19,7 +18,6 @@ import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseAddressDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseBusinessDO;
 import com.citu.module.menduner.system.dal.dataobject.enterprise.EnterpriseDO;
-import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseAddressMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseBusinessMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
@@ -279,20 +277,20 @@ public class EnterpriseServiceImpl implements EnterpriseService {
             orDefault.add(enterpriseAddressDO);
             addresseListMap.put(enterpriseAddressDO.getEnterpriseId(), orDefault);
         }
-        Set<Long>  industrysIds =new HashSet<>();
+        Set<Long> industrysIds = new HashSet<>();
         for (EnterpriseDO enterpriseDO : enterprise) {
             AppEnterpriseDetailRespVO respVO = new AppEnterpriseDetailRespVO();
             respVO.setEnterprise(EnterpriseConvert.INSTANCE.convert3(enterpriseDO));
             respVO.setBusiness(EnterpriseConvert.INSTANCE.convert4(enterpriseBusinessDOMap.get(enterpriseDO.getId())));
             respVO.setAddressList(EnterpriseConvert.INSTANCE.convertList(addresseListMap.get(enterpriseDO.getId())));
-            if(null!=respVO.getEnterprise().getScale()) {
+            if (null != respVO.getEnterprise().getScale()) {
                 respVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, respVO.getEnterprise().getScale()));
             }
             industrysIds.add(enterpriseDO.getIndustryId());
             appEnterpriseDetailRespVOS.add(respVO);
         }
-        Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);
-        appEnterpriseDetailRespVOS.forEach(item->item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
+        Map<Long, String> map = industryService.getIndustryTitleByIds(industrysIds);
+        appEnterpriseDetailRespVOS.forEach(item -> item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
 
         return appEnterpriseDetailRespVOS;
     }

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/enterprisejob/EnterpriseJobServiceImpl.java

@@ -1,10 +1,10 @@
 package com.citu.module.menduner.system.service.enterprisejob;
 
 import cn.hutool.core.collection.CollUtil;
-import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
 import com.citu.framework.dict.core.DictFrameworkUtils;
+import com.citu.framework.tenant.core.aop.TenantIgnore;
 import com.citu.module.menduner.system.controller.app.jobhunt.enterprise.vo.AppEnterpriseSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppEnterpriseJobRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedDetailRespVO;
@@ -12,25 +12,19 @@ import com.citu.module.menduner.system.controller.base.contact.EnterpriseUserCon
 import com.citu.module.menduner.system.controller.base.enterprise.vo.EnterpriseBaseSimpleRespVO;
 import com.citu.module.menduner.system.convert.EnterpriseConvert;
 import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
-import com.citu.module.menduner.system.dal.dataobject.industry.IndustryDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedExtendMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairMapper;
 import com.citu.module.menduner.system.enums.DictTypeConstants;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
 import com.citu.module.menduner.system.service.industry.IndustryService;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.citu.module.menduner.system.enums.ErrorCodeConstants.MDE_JOB_ADVERTISED_NOT_EXISTS;
@@ -102,6 +96,7 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
     }
 
     @Override
+    @TenantIgnore
     public PageResult<AppEnterpriseJobRespVO> search(AppEnterpriseSearchPageReqVO reqVO) {
         if (null != reqVO.getAreaIds()) {
             // 取最后一个元素
@@ -129,15 +124,15 @@ public class EnterpriseJobServiceImpl implements EnterpriseJobService {
             }
         });
         List<AppEnterpriseJobRespVO> list = result.getList();
-        Set<Long>  industrysIds =new HashSet<>();
+        Set<Long> industrysIds = new HashSet<>();
         for (AppEnterpriseJobRespVO appEnterpriseJobRespVO : list) {
-            if(null!=appEnterpriseJobRespVO.getEnterprise().getScale()) {
+            if (null != appEnterpriseJobRespVO.getEnterprise().getScale()) {
                 appEnterpriseJobRespVO.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(DictTypeConstants.MENDUNER_SCALE, appEnterpriseJobRespVO.getEnterprise().getScale()));
             }
             industrysIds.add(appEnterpriseJobRespVO.getEnterprise().getIndustryId());
         }
-        Map<Long,String> map =   industryService.getIndustryTitleByIds(industrysIds);
-        list.forEach(item->item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
+        Map<Long, String> map = industryService.getIndustryTitleByIds(industrysIds);
+        list.forEach(item -> item.getEnterprise().setIndustryName(map.get(item.getEnterprise().getIndustryId())));
 
 
         return result;

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/fair/FairServiceImpl.java

@@ -27,6 +27,7 @@ import com.citu.module.menduner.system.dal.mysql.fair.FairWhiteMapper;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
 import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.service.area.AreaService;
+import com.citu.module.menduner.system.service.industry.IndustryService;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
@@ -35,6 +36,8 @@ import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 import static com.citu.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -69,6 +72,9 @@ public class FairServiceImpl implements FairService {
     @Resource
     private MajorMapper majorMapper;
 
+    @Resource
+    private IndustryService industryService;
+
 
     @Override
     public Long createJobFair(JobFairSaveReqVO createReqVO) {
@@ -170,6 +176,9 @@ public class FairServiceImpl implements FairService {
     @Override
     public PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO) {
         IPage<AppFlameJobRespVO> pageResult = fairDetailMapper.search(MyBatisUtils.buildPage(reqVO), reqVO);
+        Set<Long> industryIds = pageResult.getRecords().stream().map(item -> item.getEnterprise().getIndustryId()).collect(Collectors.toSet());
+        Map<Long, String> industryTitleByIds = industryService.getIndustryTitleByIds(industryIds);
+
         PageResult<AppFlameJobRespVO> result = new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
         for (AppFlameJobRespVO record : result.getList()) {
             if (StringUtils.hasText(record.getJob().getPayUnit())) {
@@ -197,10 +206,14 @@ public class FairServiceImpl implements FairService {
                 record.getEnterprise().setFinancingStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_FINANCING_STATUS, record.getEnterprise().getFinancingStatus()));
             }
             if (StringUtils.hasText(record.getEnterprise().getScale())) {
+                record.getEnterprise().setScaleName(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
                 record.getEnterprise().setScale(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
             }
+            record.getEnterprise().setIndustryName(industryTitleByIds.get(record.getEnterprise().getIndustryId()));
             record.getJob().setStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_JOB_STATUS, record.getJob().getStatus()));
         }
+
+
         return result;
     }
 

menduner/menduner-system-biz/src/main/java/com/citu/module/menduner/system/service/job/JobIntegrationServiceImpl.java

@@ -1,21 +1,17 @@
 package com.citu.module.menduner.system.service.job;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.citu.framework.common.pojo.PageParam;
 import com.citu.framework.common.pojo.PageResult;
-import com.citu.framework.dict.core.DictFrameworkUtils;
-import com.citu.framework.mybatis.core.util.MyBatisUtils;
-import com.citu.framework.tenant.core.aop.TenantIgnore;
 import com.citu.module.menduner.common.util.LoginUserContext;
-import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobPageReqVO;
-import com.citu.module.menduner.system.controller.app.jobhunt.flame.AppFlameJobRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedRespVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobAdvertisedSearchPageReqVO;
 import com.citu.module.menduner.system.controller.app.jobhunt.job.vo.AppJobCvLookRespVO;
-import com.citu.module.menduner.system.controller.app.recruit.job.vo.*;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobExportRespVO;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobPageReqVO;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobRespVO;
+import com.citu.module.menduner.system.controller.app.recruit.job.vo.AppRecruitJobSaveReqVO;
 import com.citu.module.menduner.system.controller.app.recruit.person.cv.AppRecruitJobCvRelPageReqVO;
 import com.citu.module.menduner.system.controller.app.recruit.person.cv.AppRecruitJobCvRelRespVO;
 import com.citu.module.menduner.system.controller.app.recruit.unfit.AppRecruitUnfitCandidatePageReqVO;
@@ -30,24 +26,18 @@ import com.citu.module.menduner.system.convert.JobAdvertisedConvert;
 import com.citu.module.menduner.system.dal.dataobject.area.AreaDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobAdvertisedDO;
 import com.citu.module.menduner.system.dal.dataobject.job.JobCvRelDO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDO;
-import com.citu.module.menduner.system.dal.dataobject.job.JobFairDetailDO;
-import com.citu.module.menduner.system.dal.dataobject.major.MajorDO;
 import com.citu.module.menduner.system.dal.dataobject.position.PositionDO;
 import com.citu.module.menduner.system.dal.es.job.ESJobAdvertisedMergeDO;
 import com.citu.module.menduner.system.dal.mysql.area.AreaMapper;
 import com.citu.module.menduner.system.dal.mysql.enterprise.EnterpriseMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobAdvertisedMapper;
 import com.citu.module.menduner.system.dal.mysql.job.JobCvRelMapper;
-import com.citu.module.menduner.system.dal.mysql.job.JobFairDetailMapper;
 import com.citu.module.menduner.system.dal.mysql.major.MajorMapper;
 import com.citu.module.menduner.system.dal.mysql.position.PositionMapper;
 import com.citu.module.menduner.system.dal.mysql.unfit.UnfitCandidateMapper;
 import com.citu.module.menduner.system.service.area.AreaService;
 import com.citu.module.menduner.system.service.enterprise.bind.EnterpriseUserBindService;
-import com.citu.module.menduner.system.service.industry.IndustryService;
 import com.citu.module.menduner.system.service.interview.InterviewInviteService;
-import com.citu.module.menduner.system.service.job.fair.JobFairService;
 import com.citu.module.menduner.system.util.ESQueryBuildUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -61,7 +51,6 @@ import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
 import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
@@ -70,8 +59,6 @@ import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.citu.module.menduner.system.enums.DictTypeConstants.*;
-
 @Slf4j
 @Service
 @Validated
@@ -113,12 +100,6 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
     @Resource
     private ElasticsearchRestTemplate elasticsearchTemplate;
 
-    @Resource
-    private FairService fairService;
-
-    @Resource
-    private IndustryService industryService;
-
 
     /**
      * 包装职位发布联系人
@@ -383,86 +364,4 @@ public class JobIntegrationServiceImpl implements JobIntegrationService {
             jobAdvertisedService.save(job);
         });
     }
-
-    @Override
-    public void joinJobFair(joinJobFairReqVO reqVO) {
-        JobFairDetailDO detailDO = jobFairDetailMapper
-                .selectOne(JobFairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
-                        JobFairDetailDO::getJobId, reqVO.getJobId());
-        if (null != detailDO) {
-            // 已经加入
-            return;
-        }
-        JobFairDO jobFairDO = jobFairService.getJobFair(reqVO.getJobFairId());
-        jobFairService.checkJobFairExpired(jobFairDO);
-
-        if (ObjectUtil.isNotEmpty(jobFairDO.getVipRequire())) {
-            // 效验是否符合会员要求
-            // 不符合抛出异常提示
-        }
-        JobFairDetailDO detail = JobFairDetailDO.builder()
-                .jobFairId(jobFairDO.getId())
-                .enterpriseId(LoginUserContext.getEnterpriseId())
-                .jobId(reqVO.getJobId())
-                .build();
-        jobFairDetailMapper.insert(detail);
-    }
-
-    @Override
-    public void quitJobFair(joinJobFairReqVO reqVO) {
-        JobFairDetailDO detailDO = jobFairDetailMapper
-                .selectOne(JobFairDetailDO::getEnterpriseId, LoginUserContext.getEnterpriseId(),
-                        JobFairDetailDO::getJobId, reqVO.getJobId());
-        if (null == detailDO) {
-            // 不在招聘会里面
-            return;
-        }
-        jobFairDetailMapper.deleteById(detailDO.getId());
-    }
-
-    @TenantIgnore
-    @Override
-    public PageResult<AppFlameJobRespVO> getFlameJobPage(AppFlameJobPageReqVO reqVO) {
-        IPage<AppFlameJobRespVO> pageResult = jobFairDetailMapper.search(MyBatisUtils.buildPage(reqVO), reqVO);
-        PageResult<AppFlameJobRespVO> result = new PageResult<>(pageResult.getRecords(), pageResult.getTotal());
-        for (AppFlameJobRespVO record : result.getList()) {
-            if (StringUtils.hasText(record.getJob().getPayUnit())) {
-                record.getJob().setPayUnit(DictFrameworkUtils.getDictDataLabel(MENDUNER_PAY_UNIT, record.getJob().getPayUnit()));
-            }
-            if (StringUtils.hasText(record.getJob().getExpType())) {
-                record.getJob().setExpType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EXP_TYPE, record.getJob().getExpType()));
-            }
-            if (StringUtils.hasText(record.getJob().getEduType())) {
-                record.getJob().setEduType(DictFrameworkUtils.getDictDataLabel(MENDUNER_EDUCATION_TYPE, record.getJob().getEduType()));
-            }
-            if (null != record.getJob().getAreaId()) {
-                AreaDO area = areaService.getArea(record.getJob().getAreaId());
-                record.getJob().setAreaName(null != area ? area.getName() : null);
-            }
-            if (null != record.getJob().getPositionId()) {
-                PositionDO position = positionMapper.selectById(record.getJob().getPositionId());
-                record.getJob().setPositionName(null != position ? position.getNameCn() : null);
-            }
-            if (null != record.getJobExtend().getMajorId()) {
-                MajorDO major = majorMapper.selectById(record.getJobExtend().getMajorId());
-                record.getJobExtend().setMajorName(null != major ? major.getNameCn() : null);
-            }
-            if (StringUtils.hasText(record.getEnterprise().getFinancingStatus())) {
-                record.getEnterprise().setFinancingStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_FINANCING_STATUS, record.getEnterprise().getFinancingStatus()));
-            }
-            if (StringUtils.hasText(record.getEnterprise().getScale())) {
-                record.getEnterprise().setScale(DictFrameworkUtils.getDictDataLabel(MENDUNER_SCALE, record.getEnterprise().getScale()));
-            }
-            record.getJob().setStatus(DictFrameworkUtils.getDictDataLabel(MENDUNER_JOB_STATUS, record.getJob().getStatus()));
-        }
-        return result;
-    }
-
-    @Override
-    public List<Long> getJobIdListByJobFairIdAndEnterpriseId(Long jobFairId, Long enterpriseId) {
-        return jobFairDetailMapper.selectByJobFairIdAndEnterpriseIdList(jobFairId,  enterpriseId)
-                .stream()
-                .map(JobFairDetailDO::getJobId)
-                .collect(Collectors.toList());
-    }
 }

menduner/menduner-system-biz/src/main/resources/mapper/fair/FairDetailMapper.xml

@@ -47,50 +47,50 @@
     <select id="search"
             resultMap="AppFlameJobRespVOResultMap" >
         select
-            e.name as enterprise_name,
-            e.id as eenterprise_id,
-            d.job_id as job_id,
-            a.user_id,
-            a.area_id,
-            a.name as job_title, <!-- 招聘职位标题 -->
-            a.position_id,
-            a.type as work_experience_type,
-            a.exp_type,
-            a.edu_type,
-            a.pay_from,
-            a.pay_to,
-            a.pay_unit,
-            a.tag_list as  job_tag_list,  <!-- 职位标签 -->
-            a.content,
-            a.requirement,
-            a.expire_time,
-            a.top,
-            a.address as job_address,
-            a.longitude,
-            a.latitude,
-            a.hire,
-            a.hire_price,
-            a.status  as job_status, <!-- 职位状态 -->
-            x.major_id,
-            x.hot,
-            x.dept,
-            x.frequency,
-            e.*,
-            b.code,
-            b.type,
-            b.area,
-            b.address,
-            b.representative,
-            b.establishment_time,
-            b.registered_capital,
-            b.approval_time,
-            b.former_name,
-            b.industry,
-            b.registration_authority,
-            b.business_status,
-            b.business_term,
-            b.business_scope
-<!--       b.business_url  -->
+        e.name as enterprise_name,
+        e.id as eenterprise_id,
+        d.job_id as job_id,
+        a.user_id,
+        a.area_id,
+        a.name as job_title, <!-- 招聘职位标题 -->
+        a.position_id,
+        a.type as work_experience_type,
+        a.exp_type,
+        a.edu_type,
+        a.pay_from,
+        a.pay_to,
+        a.pay_unit,
+        a.tag_list as job_tag_list,  <!-- 职位标签 -->
+        a.content,
+        a.requirement,
+        a.expire_time,
+        a.top,
+        a.address as job_address,
+        a.longitude,
+        a.latitude,
+        a.hire,
+        a.hire_price,
+        a.status as job_status, <!-- 职位状态 -->
+        x.major_id,
+        x.hot,
+        x.dept,
+        x.frequency,
+        e.*,
+        b.code,
+        b.type,
+        b.area,
+        b.address,
+        b.representative,
+        b.establishment_time,
+        b.registered_capital,
+        b.approval_time,
+        b.former_name,
+        b.industry,
+        b.registration_authority,
+        b.business_status,
+        b.business_term,
+        b.business_scope
+        <!--       b.business_url  -->
 
         from
         mde_fair as f
@@ -99,47 +99,46 @@
         inner join mde_job_advertised_extend as x on a.id = x.job_id
         inner join mde_enterprise as e on a.enterprise_id = e.id
         left join mde_enterprise_business as b on e.id = b.enterprise_id
-       <where>
-           (f.deleted=0 and f.end_time > now()) and d.deleted = 0 and a.deleted = 0 and e.deleted = 0
-           and e.status = 0 and a.status = 0
-           and (a.expire_time > now() or a.expire_time is null)
+        <where>
+            (f.deleted=0 and f.end_time > now()) and d.deleted = 0 and a.deleted = 0 and e.deleted = 0
+            and a.status = 0
+            and (a.expire_time > now() or a.expire_time is null)
 
-           <if test="reqVO.enterpriseId != null and 0!=reqVO.enterpriseId">
-               and e.id = #{reqVO.enterpriseId}
-           </if>
-           <if test="reqVO.jobFairId != null and 0!=reqVO.jobFairId ">
-               and f.id = #{reqVO.jobFairId}
-           </if>
-           <if test="reqVO.content != null and reqVO.content != ''">
-               and (a.name like concat('%',#{reqVO.content},'%') or e.name like concat('%',#{reqVO.content},'%')) or e.another_name like concat('%',#{reqVO.content},'%'))
-           </if>
-           <if test="reqVO.areaId != null and 0!=reqVO.areaId">
-               and a.area_id = #{reqVO.areaId}
-           </if>
-           <if test="reqVO.positionId != null  and 0!= reqVO.positionId">
-               and a.position_id = #{reqVO.positionId}
-           </if>
-<!--           <if test="reqVO.jobType != null">-->
-<!--               and a.job_type = #{reqVO.jobType}-->
-<!--           </if>-->
-           <if test="reqVO.eduType != null  and 0!=reqVO.eduType ">
-               and a.edu_type = #{reqVO.eduType}
-           </if>
-           <if test="reqVO.hot != null">
-               and x.hot = #{reqVO.hot}
-           </if>
-           <if test="reqVO.majorId != null">
-               and x.major_id = #{reqVO.majorId}
-           </if>
-           <if test="reqVO.jobIds != null  and reqVO.jobIds.size() > 0 ">
-             and  d.job_id  in
-               <foreach collection="reqVO.jobIds" item="item" separator="," open="(" close=")">
-                   #{item}
-               </foreach>
-           </if>
-       </where>
+            <if test="reqVO.enterpriseId != null and 0!=reqVO.enterpriseId">
+                and e.id = #{reqVO.enterpriseId}
+            </if>
+            <if test="reqVO.jobFairId != null and 0!=reqVO.jobFairId ">
+                and f.id = #{reqVO.jobFairId}
+            </if>
+            <if test="reqVO.content != null and reqVO.content != ''">
+                and (a.name like concat('%',#{reqVO.content},'%') or e.name like concat('%',#{reqVO.content},'%')) or
+                e.another_name like concat('%',#{reqVO.content},'%'))
+            </if>
+            <if test="reqVO.areaId != null and 0!=reqVO.areaId">
+                and a.area_id = #{reqVO.areaId}
+            </if>
+            <if test="reqVO.positionId != null  and 0!= reqVO.positionId">
+                and a.position_id = #{reqVO.positionId}
+            </if>
+            <!--           <if test="reqVO.jobType != null">-->
+            <!--               and a.job_type = #{reqVO.jobType}-->
+            <!--           </if>-->
+            <if test="reqVO.eduType != null  and 0!=reqVO.eduType ">
+                and a.edu_type = #{reqVO.eduType}
+            </if>
+            <if test="reqVO.hot != null">
+                and x.hot = #{reqVO.hot}
+            </if>
+            <if test="reqVO.majorId != null">
+                and x.major_id = #{reqVO.majorId}
+            </if>
+            <if test="reqVO.jobIds != null  and reqVO.jobIds.size() > 0 ">
+                and d.job_id in
+                <foreach collection="reqVO.jobIds" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
         ORDER BY d.create_time ,a.update_time DESC
-
     </select>
-
 </mapper>