From 85220f87b8a5de0a681c8299a2ccb6e633400738 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 19 Mar 2024 12:40:49 +0800
Subject: [PATCH] =?UTF-8?q?fix=20cancelid=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Device/Services/Implements/DevicePermissionService.cs      | 3 ++-
 Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs           | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
index d72d3f38..59013e5a 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs
@@ -279,6 +279,7 @@ public class DevicePermissionService : IDevicePermissionService
             Status = DeviceTaskStatusEnumType.Wait,
             Type = taskType,
             UserNo = userNo,
+            CancellationId = 0,
             Version = 0,
         }).ToList();
 
@@ -495,7 +496,7 @@ public class DevicePermissionService : IDevicePermissionService
         return result;
     }
 
-    private static  List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
+    private static List<UserTenantDeviceCodeDto> GetAssignDeviceCodesInternal(
         GainfoEntity gainfo,
         List<GainfoGroupRelationshipEntity> gainfoGroupRelationships,
         List<DevicePermissionEntity> devicePermissions,
diff --git a/Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs b/Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs
index 93ba3b54..e286125f 100644
--- a/Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs
+++ b/Src/Dlhis.Entity/Device/Entities/DeviceTaskEntity.cs
@@ -50,7 +50,8 @@ public class DeviceTaskEntity : SugarBaseEntity, ITenantId, IVersion
     /// <summary>
     /// 取消id
     /// </summary>
-    public long CancellationId { get; set; }
+    [SugarColumn(DefaultValue = "0")]
+    public long CancellationId { get; set; } = 0;
 
 
     public string TenantId { get; set; }