From 316dc1de990561bfeb04d793a6865e133a019f8e Mon Sep 17 00:00:00 2001
From: lqh <1919773837@qq.com>
Date: Thu, 22 Jan 2026 13:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=A4=E8=AF=95=E5=89=82?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=8F=AF=E9=80=9A=E8=BF=87=E8=AF=95=E5=89=82?=
 =?UTF-8?q?=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=E5=88=86?=
 =?UTF-8?q?=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/controller/ReagentController.java          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java
index 1bb18cf..cac9d19 100644
--- a/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java
+++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/controller/ReagentController.java
@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.core.util.StrUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -27,7 +28,9 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
@@ -53,8 +56,14 @@ public class ReagentController extends BladeController {
         LambdaQueryWrapper<Reagent> wrapper = new LambdaQueryWrapper<>();
         // 模糊搜索
         if (StringUtil.isNoneBlank(entry.getName())) {
-            wrapper.like(Reagent::getManufacturer, entry.getName()).or();
-            wrapper.like(Reagent::getName, entry.getName());
+            String searchKeyword = entry.getName().trim();
+            List<String> keywordList = Arrays.stream(searchKeyword.split("\\s+"))
+                    .collect(Collectors.toList());
+            for (String keyword : keywordList) {
+                wrapper.and(w -> w.like(Reagent::getName, keyword)
+                        .or()
+                        .like(Reagent::getManufacturer, keyword));
+            }
         }
         // 时间范围搜索
         if (entry.getStartTime() != null && entry.getEndTime() != null) {