src/Hotline.Api/Controllers/SysController.cs

@@ -38,6 +38,7 @@ using XF.Domain.Repository;
 using XF.Utility.EnumExtensions;
 using Hotline.Tools;
 using Hotline.Share.Dtos.TrCallCenter;
+using Hotline.Share.Dtos.WebPortal;
 
 namespace Hotline.Api.Controllers
 {
@@ -600,14 +601,15 @@ namespace Hotline.Api.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpGet("open-common")]
-        public async Task<PagedDto<SystemCommonOpinion>> QueryOpenCommonOpinionList([FromQuery] QueryCommonDto dto)
+        public async Task<PagedDto<SystemCommonOpinionDto>> QueryOpenCommonOpinionList([FromQuery] QueryCommonDto dto)
         {
             var (total, items) = await _commonOpinionRepository.Queryable()
                 .WhereIF(dto.IsOpen != null, x => x.IsOpen == dto.IsOpen)
                 .WhereIF(!string.IsNullOrEmpty(dto.UserName), x => x.CreatorName.Contains(dto.UserName))
                 .WhereIF(dto.CommonType != null, x => x.CommonType == dto.CommonType)
                 .ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
-            return new PagedDto<SystemCommonOpinion>(total, items);
+
+            return new PagedDto<SystemCommonOpinionDto>(total, _mapper.Map<IReadOnlyList<SystemCommonOpinionDto>>(items));
         }
 
         /// <summary>export

src/Hotline.Share/Dtos/Settings/SystemCommonOpinionDto.cs

@@ -1,4 +1,6 @@
 using Hotline.Share.Enums.Settings;
+using Novacode;
+using System.Data;
 
 namespace Hotline.Share.Dtos.Settings
 {
@@ -9,9 +11,17 @@ namespace Hotline.Share.Dtos.Settings
         public string? CommonTypeText { get; set; }
         public bool? IsOpen { get; set; }
         public string? IsOpenText => IsOpen == true ? "公开常用意见" : "个人常用意见";
+        public string? AreaId { get; set; }
+        public ECommonAttributionType? AttributionType { get; set; }
+        public string? AttributionTypeText { get; set; }
+        public string? CreatorId { get; set; }
         public string? CreatorName { get; set; }
+        public string? CreatorOrgId { get; set; }
+        public int? CreatorOrgLevel { get; set; }
         public string? CreatorOrgName { get; set; }
-
+        public string? Id { get; set; }
+        public string? OldId { get; set; }
+        public int OrderBy { get; set; }
         public DateTime? CreationTime { get; set; }
     }
 }