1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppPageController.cs

@@ -309,8 +309,15 @@ namespace GxPress.Api.AppControllers
         /// <returns></returns>
         [HttpPost("channel-category-media")]
         [AllowAnonymous]
-        public async Task<PagedList<MediaCathedraResult>> GetChannelCategoryMediaPageAsync(AppChannelSearchRequest request)
+        public async Task<object> GetChannelCategoryMediaPageAsync(AppChannelSearchRequest request)
         {
+            if (request.CategoryId > 0)
+            {
+                if (await appChannelService.IsChildrenAsync(request.CategoryId))
+                {
+                    return await appChannelService.GetAllByParentIdAsync(request);
+                }
+            }
             return await appChannelService.GetChannelCategoryMediaPageAsync(request);
         }
     }

gx_api/GxPress/Model/GxPress.Result/AppChannel/AppChannelResult.cs

@@ -112,5 +112,10 @@ namespace GxPress.Result.AppChannel
         /// </summary>
         /// <value></value>
         public IEnumerable<int> MediaIds { get; set; }
+        /// <summary>
+        /// 是否分类
+        /// </summary>
+        /// <value></value>
+        public bool IsCategory { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Result/Media/MediaResult.cs

@@ -490,6 +490,7 @@ namespace GxPress.Result.Media
     /// </summary>
     public class MediaCathedraResult
     {
+        public bool IsCategory{get;set;}
         /// <summary>
         /// 简介
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/AppChannel/ChannelCategoryRepository.cs

@@ -9,6 +9,8 @@ using System.Threading.Tasks;
 using GxPress.Entity.tede2.AppChannel;
 using GxPress.Result.AppChannel;
 using System.Linq;
+using GxPress.Common.Page;
+using GxPress.Request.AppChannel;
 
 namespace GxPress.Repository.Implement.AppChannel
 {
@@ -83,5 +85,28 @@ namespace GxPress.Repository.Implement.AppChannel
         {
             return await _repository.UpdateAsync(request);
         }
+        public async Task<bool> IsChildrenAsync(int id)
+        {
+            return await _repository.ExistsAsync(Q.Where(nameof(Entity.tede2.AppChannel.ChannelCategory.ParentId), id));
+        }
+
+        /// <summary>
+        /// 根据父级获取 获取频道分类
+        /// </summary>
+        /// <returns></returns>
+        public async Task<PagedList<ChannelCategoryResult>> GetAllByParentIdAsync(AppChannelSearchRequest request)
+        {
+            var result = new PagedList<ChannelCategoryResult>();
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.tede2.AppChannel.ChannelCategory.ParentId), request.CategoryId);
+            result.Total = await _repository.CountAsync(query);
+            query.ForPage(request.Page, request.PerPage);
+            result.Items = await _repository.GetAllAsync<ChannelCategoryResult>(query);
+            foreach (var item in result.Items)
+            {
+                item.IsCategory = true;
+            }
+            return result;
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Category/CategoryRepository.cs

@@ -47,7 +47,7 @@ namespace GxPress.Repository.Implement.Category
 
         public async Task<CategoryResult> GetAsync(int id)
         {
-            return await _repository.GetAsync<CategoryResult>(Q.Where(nameof(Entity.tede2.Category.Category.Id),id));
+            return await _repository.GetAsync<CategoryResult>(Q.Where(nameof(Entity.tede2.Category.Category.Id), id));
         }
 
         public async Task<IEnumerable<CategoryResult>> GetCategoryChildrenAsync(int parentId, int typeValue)
@@ -118,5 +118,7 @@ namespace GxPress.Repository.Implement.Category
             result.AddRange(categoryResults);
             return result;
         }
+
+     
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/AppChannel/IChannelCategoryRepository.cs

@@ -1,8 +1,10 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Datory;
+using GxPress.Common.Page;
 using GxPress.Entity.tede2.AppChannel;
 using GxPress.EnumConst;
+using GxPress.Request.AppChannel;
 using GxPress.Result.AppChannel;
 
 namespace GxPress.Repository.Interface.AppChannel
@@ -38,5 +40,12 @@ namespace GxPress.Repository.Interface.AppChannel
         /// <param name="model"></param>
         /// <returns></returns>
         Task<bool> UpdateAsync(ChannelCategory request);
+        Task<bool> IsChildrenAsync(int id);
+
+        /// <summary>
+        /// 根据父级获取 获取频道分类
+        /// </summary>
+        /// <returns></returns>
+        Task<PagedList<ChannelCategoryResult>> GetAllByParentIdAsync(AppChannelSearchRequest request);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/AppChannel/AppChannelService.cs

@@ -101,5 +101,17 @@ namespace GxPress.Service.Implement.AppChannel
             }
             return result;
         }
+        public async Task<bool> IsChildrenAsync(int id)
+        {
+            return await channelCategoryRepository.IsChildrenAsync(id);
+        }
+        /// <summary>
+        /// 根据父级获取 获取频道分类
+        /// </summary>
+        /// <returns></returns>
+        public async Task<PagedList<ChannelCategoryResult>> GetAllByParentIdAsync(AppChannelSearchRequest request)
+        {
+            return await channelCategoryRepository.GetAllByParentIdAsync(request);
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/AppChannel/IAppChannelService.cs

@@ -20,16 +20,23 @@ namespace GxPress.Service.Interface.AppChannel
         /// </summary>
         /// <returns></returns>
         Task<IEnumerable<ChannelCategoryResult>> GetAllAsync(int appChannelId);
-         /// <summary>
+        /// <summary>
         /// 根据app频道分类id获取媒体分页数据
         /// </summary>
         /// <returns></returns>
         Task<PagedList<MediaCathedraResult>> GetChannelCategoryMediaPageAsync(AppChannelSearchRequest request);
 
-         /// <summary>
+        /// <summary>
         /// 查询
         /// </summary>
         /// <returns></returns>
         Task<IEnumerable<AppChannelResult>> GetAllAsync(AppChannelConst channelTypeValue);
+        Task<bool> IsChildrenAsync(int id);
+
+        /// <summary>
+        /// 根据父级获取 获取频道分类
+        /// </summary>
+        /// <returns></returns>
+        Task<PagedList<ChannelCategoryResult>> GetAllByParentIdAsync(AppChannelSearchRequest request);
     }
 }