李昊 4 years ago
parent
commit
443e5191e9

+ 9 - 0
gx_api/GxPress/Model/GxPress.Request/AppChannel/AppChannelRequest.cs

@@ -11,6 +11,15 @@ namespace GxPress.Request.AppChannel
     /// </summary>
     /// </summary>
     public class AppChannelSearchRequest : Common.Page.PageParameter
     public class AppChannelSearchRequest : Common.Page.PageParameter
     {
     {
+        /// <summary>
+        /// 频道ID
+        /// </summary>
+        /// <value></value>
+        public int ChannelId { get; set; }
+        /// <summary>
+        /// 搜索字段
+        /// </summary>
+        /// <value></value>
         public string KeyWord { get; set; }
         public string KeyWord { get; set; }
         /// <summary>
         /// <summary>
         /// 分类ID
         /// 分类ID

+ 2 - 1
gx_api/GxPress/Service/GxPress.Service.Implement/AppChannel/AppChannelService.cs

@@ -80,8 +80,9 @@ namespace GxPress.Service.Implement.AppChannel
         /// <returns></returns>
         /// <returns></returns>
         public async Task<PagedList<MediaCathedraResult>> GetChannelCategoryMediaPageAsync(AppChannelSearchRequest request)
         public async Task<PagedList<MediaCathedraResult>> GetChannelCategoryMediaPageAsync(AppChannelSearchRequest request)
         {
         {
+            var appChannel = await appChannelRepository.GetAsync(request.ChannelId);
             //获取标签
             //获取标签
-            var ids = await channelCategoryMediaRepository.GetAllAsync(request.CategoryId);
+            var ids = await channelCategoryMediaRepository.GetAllAsync(request.CategoryId == 0 ? appChannel.Id : request.CategoryId, appChannel.TypeValue == 1);
             request.Ids = ids.ToList();
             request.Ids = ids.ToList();
             return await mediaRepository.GetAppChannelsAsync(request);
             return await mediaRepository.GetAppChannelsAsync(request);
         }
         }