From 612e59d4fc51abdc935cb2cad1d7eb6311e23ba7 Mon Sep 17 00:00:00 2001 From: lqh <1919773837@qq.com> Date: Thu, 22 Jan 2026 13:55:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=B5=84=E7=AE=A1=E7=90=86=E7=89=A9?= =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8F=AF=E9=80=9A=E8=BF=87=E8=AF=95?= =?UTF-8?q?=E5=89=82=E6=88=96=E5=85=AC=E5=8F=B8=E5=85=B3=E9=94=AE=E8=AF=8D?= =?UTF-8?q?(=E5=85=B3=E9=94=AE=E8=AF=8D=E7=94=A8=E7=A9=BA=E6=A0=BC?= =?UTF-8?q?=E5=88=86=E9=9A=94)=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/goods/controller/GoodsController.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) 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) {