From b4bedd973787886189875de4f5c40ff9ae61cbcf Mon Sep 17 00:00:00 2001
From: Songzex <2402265378@qq.com>
Date: Thu, 10 Sep 2026 08:58:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=BE=84=E8=A7=84?=
 =?UTF-8?q?=E5=88=92=E4=BB=BB=E5=8A=A1=E7=9A=84=E5=8F=96=E6=B6=88=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E5=85=A5=E5=8F=82=E7=9A=84=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89deviceid=EF=BC=8C=E6=B5=8B=E8=AF=95=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../devices/data/datasources/device_task_datasource.dart       | 3 +--
 lib/features/devices/presentation/bloc/devices_cubit.dart      | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/features/devices/data/datasources/device_task_datasource.dart b/lib/features/devices/data/datasources/device_task_datasource.dart
index 773472ec..33cc4b58 100644
--- a/lib/features/devices/data/datasources/device_task_datasource.dart
+++ b/lib/features/devices/data/datasources/device_task_datasource.dart
@@ -95,10 +95,9 @@ class DeviceTaskDatasourceImpl implements DeviceTaskDatasource {
   }) async {
     final url = '${HttpApiConsts.baseUrl}/iot/deviceTask/cancelTask';
     final body = {
-      'deviceId': deviceId,
       'taskId': taskId,
-      'orgId': orgId,
       'siteId': siteId,
+      'orgId': orgId,
       'forceCancel': forceCancel,
     };
     _logger.logWithLevel('[cancelTask] 请求: POST $url');
diff --git a/lib/features/devices/presentation/bloc/devices_cubit.dart b/lib/features/devices/presentation/bloc/devices_cubit.dart
index 78870d84..0e4f791c 100644
--- a/lib/features/devices/presentation/bloc/devices_cubit.dart
+++ b/lib/features/devices/presentation/bloc/devices_cubit.dart
@@ -450,7 +450,7 @@ class DevicesCubit extends Cubit<DevicesState> {
         state.copyWith(
           isLoading: false,
           workRecords: state.workRecords
-              ?.where((record) => record != workName)
+              ?.where((record) => record['workName'] != workName)
               .toList(),
         ),
       ),