From 2b6f0ccfabfe8a04fdc47389a2166aeb8ddb9669 Mon Sep 17 00:00:00 2001 From: liuxiao <1732399289qq.com> Date: Thu, 18 Jul 2024 14:04:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/official/controller/GwJobController.java | 3 +-- .../official/service/impl/GwJobInfoServiceImpl.java | 12 ++---------- .../service/impl/GwSlideshowServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwJobController.java b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwJobController.java index f500f25..b4b1339 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwJobController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/controller/GwJobController.java @@ -41,8 +41,7 @@ public class GwJobController extends BaseController { private final IGwJobService iGwJobService; /** - * 查询招聘信息 -列表 + * 查询招聘信息列表 */ @SaCheckPermission("official:job:list") @GetMapping("/list") diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java index e42c02b..c8a246b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwJobInfoServiceImpl.java @@ -49,20 +49,12 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { } /** - * 查询招聘信息 - 列表 + * 查询招聘信息列表 */ @Override public TableDataInfo queryPageList(GwJobInfoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - //取置顶数据放在首条 - if (CollUtil.isNotEmpty(result.getRecords())){ - List records = result.getRecords(); - List fist = records.stream().filter(itx -> itx.getIsTop().equals("1")).collect(Collectors.toList()); - fist.addAll(records.stream().filter(itx->!itx.getIsTop().equals("1")).collect(Collectors.toList())); - result.setRecords(fist); - } return TableDataInfo.build(result); } @@ -85,7 +77,7 @@ public class GwJobInfoServiceImpl implements IGwJobInfoService { lqw.like(StringUtils.isNotBlank(bo.getJobName()), GwJobInfo::getJobName, bo.getJobName()); lqw.eq(StringUtils.isNotBlank(bo.getPostStatement()), GwJobInfo::getPostStatement, bo.getPostStatement()); lqw.eq(StringUtils.isNotBlank(bo.getSalaryRange()), GwJobInfo::getSalaryRange, bo.getSalaryRange()); - lqw.eq(StringUtils.isNotBlank(bo.getBaseSite()), GwJobInfo::getBaseSite, bo.getBaseSite()); + lqw.like(StringUtils.isNotBlank(bo.getBaseSite()), GwJobInfo::getBaseSite, bo.getBaseSite()); lqw.eq(StringUtils.isNotBlank(bo.getEducation()), GwJobInfo::getEducation, bo.getEducation()); lqw.eq(StringUtils.isNotBlank(bo.getAgeRange()), GwJobInfo::getAgeRange, bo.getAgeRange()); lqw.eq(bo.getReleaseTime() != null, GwJobInfo::getReleaseTime, bo.getReleaseTime()); diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java index 02d5d3f..a5c8434 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java @@ -43,7 +43,7 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { public GwSlideshowVo queryById(Long id) { GwSlideshowVo gwSlideshowVo = baseMapper.selectVoById(id); //查询详情时返回上一篇，下一篇处理 - List list = baseMapper.selectList(Wrappers.lambdaQuery().eq(GwSlideshow::getType,gwSlideshowVo.getType()).orderByDesc(GwSlideshow::getCreateTime)); + List list = baseMapper.selectList(Wrappers.lambdaQuery().eq(GwSlideshow::getType,gwSlideshowVo.getType()).orderByDesc(GwSlideshow::getIsTop).orderByDesc(GwSlideshow::getCreateTime)); getPrevNextArticles(id, gwSlideshowVo, list); return gwSlideshowVo; }