From 1a201bdedc5ce00a46ef2e9d7be3089157a6f965 Mon Sep 17 00:00:00 2001 From: liuqingkun Date: Mon, 16 Dec 2024 19:10:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=8E=A5=E5=8F=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=202.=20=E5=AE=A2=E6=88=B7=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=87=E6=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/business/contraller/WorkOrderController.java | 2 +- .../modules/business/service/impl/DeviceServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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 ea94626..20265ed 100644 --- a/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java +++ b/src/main/java/org/springblade/modules/business/contraller/WorkOrderController.java @@ -73,7 +73,7 @@ public class WorkOrderController extends BladeController { switch (workOrderDTO.getDataType()) { case "1": // 客户 - wrapper.eq(WorkOrder::getCreateUser, AuthUtil.getUserId()); + wrapper.and(wrp -> wrp.eq(WorkOrder::getCreateUser, AuthUtil.getUserId()).or().eq(WorkOrder::getReportUnit, AuthUtil.getDeptId())); break; case "2": // 客服 diff --git a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java index 4b9d088..1dce758 100644 --- a/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java +++ b/src/main/java/org/springblade/modules/business/service/impl/DeviceServiceImpl.java @@ -229,6 +229,10 @@ public class DeviceServiceImpl extends BaseServiceImpl imp @Override public void updateStatus(Integer status, Long id) { + if (Func.isEmpty(id)) { + return; + } + // 更新设备状态为故障 UpdateWrapper updateWrapper = new UpdateWrapper<>(Device.class); updateWrapper.eq("id", id);