common

src/Hotline.Api/Controllers/SysController.cs

@@ -475,7 +475,6 @@ namespace Hotline.Api.Controllers
             var rsp = new
             {
                 CommonType = EnumExts.GetDescriptions<ECommonType>(),
-                OpenState = EnumExts.GetDescriptions<EOpenState>()
             };
 
             return rsp;
@@ -493,8 +492,7 @@ namespace Hotline.Api.Controllers
         public async Task<PagedDto<SystemCommonOpinion>> QueryOpenCommonOpinionList([FromQuery]QueryCommonDto dto)
         {
             var (total,items) = await _commonOpinionRepository.Queryable()
-                .WhereIF(dto.OpenState == EOpenState.NoOpen,x=>!x.IsOpen)
-                .WhereIF(dto.OpenState == EOpenState.Open,x=>x.IsOpen)
+                .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);

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

@@ -41,19 +41,10 @@ namespace Hotline.Share.Dtos.Settings
         
         public string? UserName { get; set; }
 
-        public EOpenState OpenState { get; set; }
+        public bool? IsOpen{ get; set; }
     }
 
 
-    public enum EOpenState
-    {
-        [Description("全部")]
-        All = 0,
-        [Description("个人")]
-        NoOpen =1,
-        [Description("公开")]
-        Open = 2,
-    }
 
 
     public class AddAreaDto