diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java index dbfb85f..7fb5349 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/WaylineJobServiceImpl.java @@ -178,15 +178,19 @@ public class WaylineJobServiceImpl implements IWaylineJobService { if(ObjectUtil.isAllEmpty(proIds)){ proIds = deviceProService.listDeviceGroup(loginUser.getUserId()); } + LambdaQueryWrapper waylineJobEntityLambdaQueryWrapper = new LambdaQueryWrapper<>(); + waylineJobEntityLambdaQueryWrapper.eq(WaylineJobEntity::getWorkspaceId, workspaceId); + waylineJobEntityLambdaQueryWrapper.eq(WaylineJobEntity::getFileId, fileId); + waylineJobEntityLambdaQueryWrapper.in(ObjectUtil.isAllNotEmpty(proIds),WaylineJobEntity::getProId,proIds); + if(ObjectUtil.isNotEmpty(name)){ + waylineJobEntityLambdaQueryWrapper.and(wrapper ->{ + wrapper.like(WaylineJobEntity::getName, name).or().like(WaylineJobEntity::getWaylineName, name); + }); + }; + waylineJobEntityLambdaQueryWrapper.orderByDesc(WaylineJobEntity::getId); Page pageData = mapper.selectPage( - new Page(page, pageSize), - new LambdaQueryWrapper() - .eq(WaylineJobEntity::getWorkspaceId, workspaceId) - .eq(WaylineJobEntity::getFileId, fileId) - .like(ObjectUtil.isNotEmpty(name),WaylineJobEntity::getName, name).or().like(ObjectUtil.isNotEmpty(name),WaylineJobEntity::getWaylineName,name) - .in(ObjectUtil.isAllNotEmpty(proIds),WaylineJobEntity::getProId,proIds) - .orderByDesc(WaylineJobEntity::getId)); - List records = pageData.getRecords() + new Page(page, pageSize),waylineJobEntityLambdaQueryWrapper); + List records = pageData.getRecords() .stream() .map(this::entity2Dto) .collect(Collectors.toList());