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 GetAssignDeviceCodesInternal( + private static List GetAssignDeviceCodesInternal( GainfoEntity gainfo, List gainfoGroupRelationships, List 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 /// /// 取消id /// - public long CancellationId { get; set; } + [SugarColumn(DefaultValue = "0")] + public long CancellationId { get; set; } = 0; public string TenantId { get; set; }