diff --git a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java index 13cd3f1..9d43f6e 100644 --- a/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java +++ b/lab-service/lab-capital/src/main/java/org/springblade/lims/goods/controller/GoodsController.java @@ -49,6 +49,7 @@ import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; +import java.util.stream.Collectors; import static java.util.stream.Collectors.toList; @@ -87,12 +88,15 @@ public class GoodsController extends BladeController { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); // 添加物品查询模糊查询 if (StringUtil.isNoneBlank(goods.getName())) { - queryWrapper.and(eq -> eq - .like(Goods::getName, goods.getName()).or() - .like(Goods::getCompany, goods.getName()).or() - .like(Goods::getBrand, goods.getName()).or() - .like(Goods::getYt, goods.getName()) - ); + String searchKeyword = goods.getName().trim(); + List keywordList = Arrays.stream(searchKeyword.split("\\s+")) + .collect(Collectors.toList()); + for (String keyword : keywordList) { + queryWrapper.and(w -> w.like(Goods::getName, keyword) + .or().like(Goods::getCompany, keyword) + .or().like(Goods::getBrand, keyword) + .or().like(Goods::getYt, keyword)); + } } // 根据物品类型大类查询 if (goods.getBigClassId() != null) {