From 96ed9e04ef6dd6bd472100cedf976fb2136de32a Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 8 Mar 2024 17:07:07 +0800
Subject: [PATCH] =?UTF-8?q?fix=20tenantId=20null=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TaskAssignment/Job/CreateGetUploadRecordJob.cs          | 6 +++++-
 .../TaskAssignment/Job/CreateSyncServerDateTimeJob.cs       | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateGetUploadRecordJob.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateGetUploadRecordJob.cs
index f8835e35..d11caa4c 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateGetUploadRecordJob.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateGetUploadRecordJob.cs
@@ -11,16 +11,19 @@ public class CreateGetUploadRecordJob
 {
     private readonly IDbContext _dbContext;
     private readonly ILogger<CreateGetUploadRecordJob> _logger;
+    private readonly ISqlSugarOptionsService _sqlSugarOptionsService;
 
-    public CreateGetUploadRecordJob(IDbContext dbContext, ILogger<CreateGetUploadRecordJob> logger)
+    public CreateGetUploadRecordJob(IDbContext dbContext, ILogger<CreateGetUploadRecordJob> logger, ISqlSugarOptionsService sqlSugarOptionsService)
     {
         _logger = logger;
+        _sqlSugarOptionsService = sqlSugarOptionsService;
         _dbContext = dbContext;
     }
 
     public async Task RunAsync()
     {
         _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
+        _sqlSugarOptionsService.IgnoreTenant = true;
         try
         {
             var devices = await _dbContext.Queryable<DeviceEntity>()
@@ -60,6 +63,7 @@ public class CreateGetUploadRecordJob
         }
         finally
         {
+            _sqlSugarOptionsService.IgnoreTenant = false;
             _dbContext.Client.QueryFilter.Restore();
         }
     }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs
index 789d6722..a8efb1c1 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Job/CreateSyncServerDateTimeJob.cs
@@ -10,17 +10,20 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
     {
         private readonly IDbContext _dbContext;
         private readonly ILogger<CreateSyncServerDateTimeJob> _logger;
+        private readonly ISqlSugarOptionsService _sqlSugarOptionsService;
 
-        public CreateSyncServerDateTimeJob(IDbContext dbContext, ILogger<CreateSyncServerDateTimeJob> logger)
+        public CreateSyncServerDateTimeJob(IDbContext dbContext, ILogger<CreateSyncServerDateTimeJob> logger, ISqlSugarOptionsService sqlSugarOptionsService)
         {
             _dbContext = dbContext;
             _logger = logger;
+            _sqlSugarOptionsService = sqlSugarOptionsService;
         }
 
 
         public async Task RunAsync()
         {
             _dbContext.Client.QueryFilter.ClearAndBackup<ITenantId>();
+            _sqlSugarOptionsService.IgnoreTenant = true;
             try
             {
                 var deviceUniqueNos = await _dbContext.Queryable<DeviceTaskEntity>()
@@ -60,6 +63,7 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Job
             }
             finally
             {
+                _sqlSugarOptionsService.IgnoreTenant = false;
                 _dbContext.Client.QueryFilter.Restore();
             }
         }