Explorar el Código

timezone fix and log search

johnechoo hace 3 años
padre
commit
a70eee6fee

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Logging/SysLogDiffService.cs

@@ -22,8 +22,8 @@ public class SysLogDiffService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<SysLogDiff>> Page(PageLogInput input)
     {
         return await _sysLogDiffRep.AsQueryable()
-            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
-                u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
             .ToPagedListAsync(input.Page, input.PageSize);
     }

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Logging/SysLogExService.cs

@@ -24,8 +24,8 @@ public class SysLogExService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<SysLogEx>> Page(PageLogInput input)
     {
         return await _sysLogExRep.AsQueryable()
-            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
-                u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
             //.OrderBy(u => u.CreateTime, OrderByType.Desc)
             .OrderBuilder(input)
             .ToPagedListAsync(input.Page, input.PageSize);

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Logging/SysLogOpService.cs

@@ -24,8 +24,8 @@ public class SysLogOpService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<SysLogOp>> Page(PageLogInput input)
     {
         return await _sysLogOpRep.AsQueryable()
-            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
-                u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
             //.OrderBy(u => u.CreateTime, OrderByType.Desc)
             .OrderBuilder(input)
             .ToPagedListAsync(input.Page, input.PageSize);

+ 2 - 2
Admin.NET/Admin.NET.Core/Service/Logging/SysLogVisService.cs

@@ -22,8 +22,8 @@ public class SysLogVisService : IDynamicApiController, ITransient
     public async Task<SqlSugarPagedList<SysLogVis>> Page(PageLogInput input)
     {
         return await _sysLogVisRep.AsQueryable()
-            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()) && !string.IsNullOrWhiteSpace(input.EndTime.ToString()),
-                u => u.CreateTime >= input.StartTime && u.CreateTime <= input.EndTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.StartTime.ToString()), u => u.CreateTime >= input.StartTime)
+            .WhereIF(!string.IsNullOrWhiteSpace(input.EndTime.ToString()), u => u.CreateTime <= input.EndTime)
             .OrderBy(u => u.CreateTime, OrderByType.Desc)
             .ToPagedListAsync(input.Page, input.PageSize);
     }

+ 1 - 0
Admin.NET/Admin.NET.Web.Core/Startup.cs

@@ -63,6 +63,7 @@ public class Startup : AppStartup
                 .AddAppLocalization()
                 .AddNewtonsoftJson(options =>
                 {
+                    options.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Local;
                     options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver(); // 首字母小写(驼峰样式)
                     options.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss"; // 时间格式化
                     // options.SerializerSettings.MetadataPropertyHandling = MetadataPropertyHandling.Ignore;