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);