diff --git a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java index b75d817b..85fea24c 100644 --- a/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java +++ b/modules/module-ci-process-biz/src/main/java/cd/casic/ci/process/process/service/pipeline/impl/PipelineServiceImpl.java @@ -304,25 +304,26 @@ public class PipelineServiceImpl extends ServiceImpl i @Override public PageResult findPipelinePage(PipelineQueryReq query) { - QueryWrapper wrapper = new QueryWrapper<>(); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); if (!ObjectUtils.isEmpty(query.getId())){ - wrapper.eq("id",query.getId()); + wrapper.eq(PipPipeline::getId,query.getId()); } if (!ObjectUtils.isEmpty(query.getIdList())){ - wrapper.in("id",query.getId()); + wrapper.in(PipPipeline::getId,query.getId()); } if (!ObjectUtils.isEmpty(query.getName())){ - wrapper.like("name",query.getName()); + wrapper.like(PipPipeline::getName,query.getName()); } if (!ObjectUtils.isEmpty(query.getCreator())){ - wrapper.eq("creator",query.getCreator()); + wrapper.eq(PipPipeline::getCreator,query.getCreator()); } if (!ObjectUtils.isEmpty(query.getCollect())){ - wrapper.eq("collect",query.getCollect()); + wrapper.eq(PipPipeline::getCollect,query.getCollect()); } if (!ObjectUtils.isEmpty(query.getGroupId())){ - wrapper.eq("group_id",query.getGroupId()); + wrapper.eq(PipPipeline::getGroupId,query.getGroupId()); } + wrapper.orderByDesc(PipPipeline::getCreateTime); Page pipPipelinePage = pipelineDao.selectPage(new Page<>(query.getPageNo(), query.getPageSize()), wrapper); if (ObjectUtils.isEmpty(pipPipelinePage)){