diff --git a/src/main/java/com/iflytop/gd/app/controller/TasksController.java b/src/main/java/com/iflytop/gd/app/controller/TasksController.java index bf08b77..56fe0b3 100644 --- a/src/main/java/com/iflytop/gd/app/controller/TasksController.java +++ b/src/main/java/com/iflytop/gd/app/controller/TasksController.java @@ -15,6 +15,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.*; @Tag(name = "实验") @@ -28,7 +29,17 @@ public class TasksController { @Operation(summary = "实验列表") @GetMapping("/list") public PageResult list(GetAllTasksDTO getAllTasksDTO) { - IPage result = tasksService.page(new Page<>(getAllTasksDTO.getPageNum(), getAllTasksDTO.getPageSize()), new LambdaQueryWrapper().like(Tasks::getName, "%" + getAllTasksDTO.getName() + "%")); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like( + StringUtils.hasText(getAllTasksDTO.getName()), + Tasks::getName, + getAllTasksDTO.getName() + ); + + IPage result = tasksService.page( + new Page<>(getAllTasksDTO.getPageNum(), getAllTasksDTO.getPageSize()), + queryWrapper + ); return PageResult.success(result); }