11

gx_api/GxPress/Api/GxPress.Api/AppControllers/GroupController.cs

@@ -229,7 +229,7 @@ namespace GxPress.Api.AppControllers
         /// <param name="categoryId"></param>
         /// <returns></returns>
         [HttpGet("category-list/{categoryId}")]
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
+        public async Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId)
         {
             return await _groupService.GetAllAsync(categoryId, _loginContext.AccountId);
         }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebGroupController.cs

@@ -81,7 +81,7 @@ namespace GxPress.Api.WebControllers
         /// <returns></returns>
         [HttpGet("category-list/{categoryId}")]
         [AllowAnonymous]
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId)
+        public async Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId)
         {
             return await _groupService.GetAllAsync(categoryId, _loginContext.AccountId);
         }

gx_api/GxPress/Model/GxPress.Result/App/Group/GroupDetailResult.cs

@@ -241,6 +241,11 @@ namespace GxPress.Result.App.Group
         /// <value></value>
         public int UserCount { get; set; }
         /// <summary>
+        /// 发布数量
+        /// </summary>
+        /// <value></value>
+        public int TopicCount { get; set; }
+        /// <summary>
         /// 是否申请
         /// </summary>
         /// <value></value>

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupRepository.cs

@@ -438,10 +438,13 @@ namespace GxPress.Repository.Implement
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId)
+        public async Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId, int userId)
         {
             var sql = $@"SELECT 
-                            *,
+                             a.Id,
+                            a.Name,
+                            a.AvatarUrl,
+                            a.Introduce,
                             (SELECT 
                                     COUNT(1)
                                 FROM
@@ -453,7 +456,7 @@ namespace GxPress.Repository.Implement
                                 FROM
                                     tede_topic
                                 WHERE
-                                    GroupId = a.Id) AS GroupArticleCount
+                                    GroupId = a.Id) AS TopicCount
                         FROM
                             tede_group a
                         WHERE

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupRepository.cs

@@ -83,7 +83,7 @@ namespace GxPress.Repository.Interface
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId);
+        Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId, int userId);
         /// <summary>
         /// 用户小组列表
         /// </summary>

gx_api/GxPress/Service/GxPress.Service.Implement/Group/GroupService.Category.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using GxPress.Result.App.Group;
 
 namespace GxPress.Service.Implement.Group
 {
@@ -11,7 +12,7 @@ namespace GxPress.Service.Implement.Group
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        public async Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId,int userId)
+        public async Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId,int userId)
         {
             var group = await _groupRepository.GetAllAsync(categoryId,userId);
             foreach (var item in group)

gx_api/GxPress/Service/GxPress.Service.Interface/Group/IGroupService.cs

@@ -52,7 +52,7 @@ namespace GxPress.Service.Interface.Group
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId);
+        Task<IEnumerable<SearchGroupDetailResult>> GetAllAsync(int categoryId, int userId);
         /// <summary>
         /// 小组转移
         /// </summary>