diff --git a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs index f06f0681..fc8934fa 100644 --- a/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs +++ b/Src/Dlhis.Basic/Device/Controllers/DevicePermissionsController.cs @@ -156,6 +156,7 @@ public class DevicePermissionsController : ControllerBase } [HttpPost("removeExceptUsers")] + [Transactional] [IgnoreTenant] public async Task GenerateDeleteDeviceTasksAsync(DeviceRemoveExceptUserRequest request) { diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs index 51565d65..ba80f79f 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DevicePermissionService.cs @@ -548,6 +548,12 @@ public class DevicePermissionService : IDevicePermissionService .Select(x => x.No) .ToListAsync(); + await _dbContext.Updateable() + .SetColumns(x => x.IsDeleted == true) + .SetColumns(x => x.ModifiedTime == DateTime.Now) + .Where(x => x.DeviceUniqueNo == deviceUniqueNo) + .ExecuteCommandAsync(); + return await _dbContext.InsertAsync(userNos.Select(x => new DeviceTaskEntity { DeviceUniqueNo = device.UniqueNo,