Merge remote-tracking branch 'origin/dev' into dev

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<WaylineJobEntity> 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<WaylineJobEntity> pageData = mapper.selectPage(
-                new Page<WaylineJobEntity>(page, pageSize),
-                new LambdaQueryWrapper<WaylineJobEntity>()
-                        .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<WaylineJobDTO> records = pageData.getRecords()
+                new Page<WaylineJobEntity>(page, pageSize),waylineJobEntityLambdaQueryWrapper);
+                List<WaylineJobDTO> records = pageData.getRecords()
                 .stream()
                 .map(this::entity2Dto)
                 .collect(Collectors.toList());