1

gx_api/GxPress/Api/GxPress.Api/AdminControllers/AdminSystemLabelController.cs

@@ -52,10 +52,19 @@ namespace GxPress.Api.AdminControllers
         /// 获取标签列表
         /// </summary>
         /// <returns></returns>
-        [HttpPost("list")]
-        public async Task<PagedList<SystemLabelResult>> GetAllAsync(Common.Page.PageParameter pageParameter)
+        [HttpGet("list")]
+        public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
         {
-            return await systemLabelService.GetAllAsync(pageParameter);
+            return await systemLabelService.GetAllAsync();
+        }
+        /// <summary>
+        /// 获取标签列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost("list-page")]
+        public async Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter pageParameter)
+        {
+            return await systemLabelService.GetAllPageAsync(pageParameter);
         }
         /// <summary>
         /// 删除

gx_api/GxPress/Repository/GxPress.Repository.Implement/SystemLabel/SystemLabelRepository.cs

@@ -91,7 +91,7 @@ namespace GxPress.Repository.Implement.SystemLabel
             return await _repository.UpdateAsync(query) > 0;
         }
 
-        public async Task<PagedList<SystemLabelResult>> GetAllAsync(Common.Page.PageParameter request)
+        public async Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request)
         {
             var result = new PagedList<SystemLabelResult>();
             var query = Q.NewQuery();
@@ -109,6 +109,14 @@ namespace GxPress.Repository.Implement.SystemLabel
             }
             return result;
         }
+        public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.SystemLabel.SystemLabel.IsDisable), false);
+            query.OrderByDesc(nameof(Entity.Navigations.Navigation.Sort));
+            var result = await _repository.GetAllAsync<SystemLabelResult>(query);
+            return result;
+        }
         public async Task<IEnumerable<Entity.SystemLabel.SystemLabel>> GetAllAsync(List<int> ids)
         {
             return await _repository.GetAllAsync(Q.WhereIn(nameof(Entity.SystemLabel.SystemLabel.Id), ids));

gx_api/GxPress/Repository/GxPress.Repository.Interface/SystemLabel/ISystemLabelRepository.cs

@@ -16,9 +16,9 @@ namespace GxPress.Repository.Interface.SystemLabel
         Task<int> InsertAsync(Entity.SystemLabel.SystemLabel note);
 
         Task<bool> UpdateAsync(SystemLabelUpRequest note);
-        Task<PagedList<SystemLabelResult>> GetAllAsync(Common.Page.PageParameter request);
+        Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request);
         Task<IEnumerable<Entity.SystemLabel.SystemLabel>> GetAllAsync(List<int> ids);
         Task<Entity.SystemLabel.SystemLabel> GetByNameAsync(string name);
-
+        Task<IEnumerable<SystemLabelResult>> GetAllAsync();
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/SystemLabel/SystemLabelService.cs

@@ -3,6 +3,7 @@ using GxPress.Repository.Interface.SystemLabel;
 using System.Threading.Tasks;
 using GxPress.Common.Page;
 using GxPress.Result.SystemLabel;
+using System.Collections.Generic;
 
 namespace GxPress.Service.Implement.SystemLabel
 {
@@ -16,14 +17,19 @@ namespace GxPress.Service.Implement.SystemLabel
             this.systemLableMediaRepository = systemLableMediaRepository;
         }
 
-        public async Task<PagedList<SystemLabelResult>> GetAllAsync(Common.Page.PageParameter request)
+        public async Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request)
         {
-            var result = await systemLabelRepository.GetAllAsync(request);
+            var result = await systemLabelRepository.GetAllPageAsync(request);
             foreach (var item in result.Items)
             {
                 item.MediaIds = await systemLableMediaRepository.GetMediaIdsAsync(item.Id,0);
             }
             return result;
         }
+         public async Task<IEnumerable<SystemLabelResult>> GetAllAsync()
+        {
+            var result = await systemLabelRepository.GetAllAsync();
+            return result;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/SystemLabel/ISystemLabelService.cs

@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Common.Page;
 using GxPress.Result.SystemLabel;
@@ -6,6 +7,7 @@ namespace GxPress.Service.Interface.SystemLabel
 {
     public interface ISystemLabelService : IService
     {
-        Task<PagedList<SystemLabelResult>> GetAllAsync(Common.Page.PageParameter request);
+        Task<PagedList<SystemLabelResult>> GetAllPageAsync(Common.Page.PageParameter request);
+         Task<IEnumerable<SystemLabelResult>> GetAllAsync();
     }
 }