From 15e5c7f62102cc7be1c7d3108a47e543aaf575b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=96=9B=E5=AE=8F=E7=A5=A5?=
 <14281818+xue-hongxiang@user.noreply.gitee.com>
Date: Mon, 23 Dec 2024 14:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E7=BB=B4=E4=BF=AE=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?+=E7=BB=B4=E4=BF=9D=E6=B5=81=E7=A8=8B=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/contraller/MaintenanceController.java | 12 ++++++++----
 .../service/impl/WorkOrderServiceImpl.java         | 14 +++++++++-----
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
index d5285ad..4253941 100644
--- a/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
+++ b/src/main/java/org/springblade/modules/business/contraller/MaintenanceController.java
@@ -203,8 +203,10 @@ public class MaintenanceController extends BladeController {
         taskService.updateById(taskOld);
         //发送消息
         String role = "1839536982874193922";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-        messageService.saveMessage(task.getTaskCode(), "客户已经确认巡检任务完成", user.getId(), 1);
+        List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        for (User user : userList) {
+            messageService.saveMessage(task.getTaskCode(), "客户已经确认巡检任务完成", user.getId(), 1);
+        }
         return R.success();
     }
 
@@ -356,8 +358,10 @@ public class MaintenanceController extends BladeController {
         taskService.updateById(taskOld);
         //发送消息
         String role = "1847220301770326017";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
-        messageService.saveMessage(task.getTaskCode(), "维修方案已被客户驳回，请重新审批", user.getId(), 1);
+        List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        for (User user : userList) {
+            messageService.saveMessage(task.getTaskCode(), "维修方案已被客户驳回，请重新审批", user.getId(), 1);
+        }
         return R.success();
     }
 
diff --git a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
index 0f5235d..d3a2b34 100644
--- a/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
+++ b/src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java
@@ -121,7 +121,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
     @Synchronized
     public boolean saveAndSubmit(List<WorkOrderVO> workOrders) {
         String role = "1839536982874193922";
-        User customerService = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        List<User> customerServiceList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
         Date now = DateUtil.date();
         String todayStr = format.format(now);
@@ -135,7 +135,9 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
             // 查询今天已提报数量
             String hz = count < 9 ? "0" + (count + 1) : count + 1 + "";
             String code = "WX-" + todayStr + "-" + hz;
-            messageService.saveMessage(code, "您有一个需求单需要处理", customerService.getId(), 2);
+            for (User customerService : customerServiceList) {
+                messageService.saveMessage(code, "您有一个需求单需要处理", customerService.getId(), 2);
+            }
             workOrder.setFillingTime(now);
             workOrder.setRequirementCode(code);
             // 待接单
@@ -346,10 +348,12 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
 
         // 更新设备状态为运行中
         deviceService.updateStatus(CommonConstant.DEVICE_RUN_STATUS_WORKING, workOrder.getDeviceId());
-        String role = "1839536982874193922";
-        User user = userService.getOne(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
         //消息发送
-        messageService.saveMessage(workOrder.getRequirementCode(), "已完成维修，请确认客户是否付款", user.getId(), 2);
+        String role = "1839536982874193922";
+        List<User> userList = userService.list(Wrappers.lambdaQuery(User.class).eq(User::getRoleId, role));
+        for (User user : userList) {
+            messageService.saveMessage(workOrder.getRequirementCode(), "已完成维修，请确认客户是否付款", user.getId(), 2);
+        }
 
     }