1、合并代码

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

@@ -176,7 +176,8 @@ 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());
+        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());

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

@@ -111,7 +111,7 @@
                 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
+                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">