From a47bdfa38549c17e7f07d0a7472ff4ba1e29e95e Mon Sep 17 00:00:00 2001
From: zhouxinyu <121470181@qq.com>
Date: Mon, 20 Jan 2025 18:07:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B7=A5=E4=BD=9C=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/contraller/WorkOrderController.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
index 7f5f7b9..4a98d79 100644
--- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java
@@ -46,6 +46,7 @@ import java.net.URLConnection;
 import java.net.URLEncoder;
 import java.util.*;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 /**
  * 工单表 控制器
@@ -129,6 +130,20 @@ public class WorkOrderController extends BladeController {
                 });
             }
         }
+        // 处理维修人员名称查询条件
+        if (StringUtils.isNotBlank(workOrderDTO.getRepairPersonName())) {
+            // 根据维修人员的名字模糊查询用户列表
+            List<User> userList = userService.list(Wrappers.lambdaQuery(User.class)
+                    .like(User::getName, workOrderDTO.getRepairPersonName()));
+
+            if (!userList.isEmpty()) {
+                List<Long> userIds = userList.stream().map(User::getId).collect(Collectors.toList());
+                wrapper.in(WorkOrder::getRepairPerson, userIds);
+            } else {
+                // 如果没有找到对应的用户，则使查询结果为空
+                wrapper.and(w -> w.eq(WorkOrder::getId, -1L));
+            }
+        }
 
         // 执行分页查询
         IPage<WorkOrder> pages = workOrderService.page(Condition.getPage(query), wrapper);