田爽 3 месяцев назад
Родитель
Сommit
756e3ec6f4

+ 28 - 24
src/Hotline.Api/Controllers/SysController.cs

@@ -565,30 +565,34 @@ namespace Hotline.Api.Controllers
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpGet("log_list")]
-        public async Task<PagedDto<SystemLogDto>> List([FromQuery] SysLogPagedKeywordRequest dto)
-        {
-	        var (total, items) = await _systemLogRepository.Queryable()
-		        .WhereIF(dto.IsAll.HasValue && !dto.IsAll.Value, x => !string.IsNullOrEmpty(x.Name))
-		        .WhereIF(!string.IsNullOrEmpty(dto.Name), x => x.Name.Contains(dto.Name))
-		        .WhereIF(!string.IsNullOrEmpty(dto.CreatorName), x => x.CreatorName.Contains(dto.CreatorName))
-		        .WhereIF(!string.IsNullOrEmpty(dto.ExecuteUrl), x => x.ExecuteUrl.Contains(dto.ExecuteUrl))
-		        .WhereIF(!string.IsNullOrEmpty(dto.ExecuteParam),
-			        x => SqlFunc.JsonLike(x.ExecuteParam, dto.ExecuteParam))
-		        .WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue,
-			        x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
-		        //.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Name.Contains(dto.Keyword!) || x.CreatorName.Contains(dto.Keyword!))
-		        .OrderByDescending(x => x.CreationTime)
-		        .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-            return new PagedDto<SystemLogDto>(total, _mapper.Map<IReadOnlyList<SystemLogDto>>(items));
-            
-        }
-
-        /// <summary>
-        /// 获取日志实体
-        /// </summary>
-        /// <param name="id"></param>
-        /// <returns></returns>
-        [HttpGet("log/{id}")]
+		public async Task<PagedDto<SystemLogDto>> List([FromQuery] SysLogPagedKeywordRequest dto)
+		{
+			var (total, items) = await _systemLogRepository.Queryable()
+				.WhereIF(dto.IsAll.HasValue && !dto.IsAll.Value, x => !string.IsNullOrEmpty(x.Name))
+				.WhereIF(!string.IsNullOrEmpty(dto.Name), x => x.Name.Contains(dto.Name))
+				.WhereIF(!string.IsNullOrEmpty(dto.CreatorName), x => x.CreatorName.Contains(dto.CreatorName))
+				.WhereIF(!string.IsNullOrEmpty(dto.ExecuteUrl), x => x.ExecuteUrl.Contains(dto.ExecuteUrl))
+				.WhereIF(!string.IsNullOrEmpty(dto.ExecuteParam),
+					x => SqlFunc.JsonLike(x.ExecuteParam, dto.ExecuteParam))
+				.WhereIF(dto.StartTime.HasValue && dto.EndTime.HasValue,
+					x => x.CreationTime >= dto.StartTime && x.CreationTime <= dto.EndTime)
+				//.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Name.Contains(dto.Keyword!) || x.CreatorName.Contains(dto.Keyword!))
+				.Select(x => new SystemLogDto
+				{
+					ExecuteParam = x.ExecuteParam
+				}, true)
+				.OrderByDescending(x => x.CreationTime)
+				.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
+			return new PagedDto<SystemLogDto>(total, items);
+
+		}
+
+		/// <summary>
+		/// 获取日志实体
+		/// </summary>
+		/// <param name="id"></param>
+		/// <returns></returns>
+		[HttpGet("log/{id}")]
         public async Task<SystemLogDto> ItemEntity(string id)
         {
             var log = await _systemLogRepository.Queryable()

+ 1 - 1
src/Hotline.Share/Dtos/Settings/SystemLogDto.cs

@@ -66,7 +66,7 @@ namespace Hotline.Share.Dtos.Settings
 		/// <summary>
 		/// 请求参数 
 		///</summary>
-		public Dictionary<string, object>? ExecuteParam { get; set; }
+		public object? ExecuteParam { get; set; }
 
 		/// <summary>
 		/// 请求结果