From aba4fa7ee9ba7fce715f5c1b0af38acf4441736d Mon Sep 17 00:00:00 2001
From: cheche <717840555@qq.com>
Date: Wed, 20 Mar 2024 09:55:13 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=88=A0=E9=99=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Common/Services/ApiLogService.cs          |  4 ++--
 Src/Dlhis.Entity/Common/ApiLogEntity.cs             |  2 +-
 .../CommonJobs/DelApiLogTaskJob.cs                  | 13 +++++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Src/Dlhis.Common/Services/ApiLogService.cs b/Src/Dlhis.Common/Services/ApiLogService.cs
index 2a6b9550..22c3d02c 100644
--- a/Src/Dlhis.Common/Services/ApiLogService.cs
+++ b/Src/Dlhis.Common/Services/ApiLogService.cs
@@ -20,11 +20,11 @@ namespace Dlhis.Common.Services
         }
 
         public async Task<Pagination<ApiLogResponse>> GetLogsAsync(ApiLogRequest request)
-        {
+        {  
             var logs = await _dbContext.ChangeDb("log").Queryable<ApiLogEntity>()
                     .WhereIF(request.Search.IsPresent(), x => x.Message.Contains(request.Search))
                     .WhereIF(request.Level.HasValue, x => x.Level == request.Level)
-                    .OrderBy(x => x.Timestamp,OrderByType.Desc)
+                    .OrderBy(x => x.Timestamp, OrderByType.Desc)
                     .Select<ApiLogResponse>()
                     .ToPageListAsync(request);
 
diff --git a/Src/Dlhis.Entity/Common/ApiLogEntity.cs b/Src/Dlhis.Entity/Common/ApiLogEntity.cs
index e2005b72..2f8fd03a 100644
--- a/Src/Dlhis.Entity/Common/ApiLogEntity.cs
+++ b/Src/Dlhis.Entity/Common/ApiLogEntity.cs
@@ -9,7 +9,7 @@ namespace Dlhis.Entity.Common;
 /// api日志表
 /// </summary>
 [SugarTable(TableName = "Logs", TableDescription = "api日志表")]
-public class ApiLogEntity 
+public class ApiLogEntity : SugarBaseEntity
 {
     /// <summary>
     /// 时间
diff --git a/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs b/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs
index d623561b..714d4e58 100644
--- a/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs
+++ b/Src/Dlhis.ScheduledTask/CommonJobs/DelApiLogTaskJob.cs
@@ -26,10 +26,19 @@ namespace Dlhis.ScheduledTask.CommonJobs;
             var logs = await _dbContext.ChangeDb("log")
                 .Queryable<ApiLogEntity>()
                 .Where(x => x._ts <= threeDaysAgoStart)
-                .OrderBy(x => x._ts, OrderByType.Asc)
+                .Select(x => x.Id)
                 .ToListAsync();
 
-            await _dbContext.ChangeDb("log").DeleteReallyAsync(logs);
+            var lst = new List<ApiLogEntity>();
+            foreach (var id in logs)
+            {
+                var entity = new ApiLogEntity
+                {
+                    Id = id,
+                };
+                lst.Add(entity);
+            }
+            await _dbContext.ChangeDb("log").DeleteReallyAsync(lst);
         }
         catch (Exception ex)
         {