1

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

@@ -264,5 +264,15 @@ namespace GxPress.Api.AppControllers
             request.UserId = _loginContext.AccountId;
             return await _groupService.SetGroupTransferAsync(request);
         }
+
+        /// <summary>
+        /// /// 小组列表 搜索专用
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("list")]
+        public async Task<IEnumerable<UserGroupResult>> GetUserGroupListAsync()
+        {
+            return await _groupRepository.GetUserGroupListAsync(_loginContext.AccountId);
+        }
     }
 }

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

@@ -268,5 +268,14 @@ namespace GxPress.Api.WebControllers
             request.UserId = _loginContext.AccountId;
             return await _groupService.SetGroupTransferAsync(request);
         }
+        /// <summary>
+        /// /// 小组列表 搜索专用
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("list")]
+        public async Task<IEnumerable<UserGroupResult>> GetUserGroupListAsync()
+        {
+            return await _groupRepository.GetUserGroupListAsync(_loginContext.AccountId);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Request/App/Topic/TopicDetailListRequest.cs

@@ -8,11 +8,16 @@ namespace GxPress.Request.App.Topic
     /// <summary>
     /// 
     /// </summary>
-    public class TopicDetailListRequest:PageParameter
+    public class TopicDetailListRequest : PageParameter
     {
         /// <summary>
         /// 小组ID
         /// </summary>
+        public List<int> GroupIds { get; set; }
+        /// <summary>
+        /// 小组ID
+        /// </summary>
+        /// <value></value>
         public int GroupId { get; set; }
         /// <summary>
         /// 用户ID
@@ -22,5 +27,9 @@ namespace GxPress.Request.App.Topic
         /// 搜索
         /// </summary>
         public string Key { get; set; }
+        public TopicDetailListRequest()
+        {
+            GroupIds = new List<int>();
+        }
     }
 }

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

@@ -182,5 +182,20 @@ namespace GxPress.Result.App.Group
         /// <value></value>
         public int UserCount { get; set; }
     }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UserGroupResult
+    {
+        /// <summary>
+        /// 小组ID  -1 全网公开 -2 我的小组 
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 小组名称
+        /// </summary>
+        public string Name { get; set; }
+
+    }
 
 }

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

@@ -398,7 +398,6 @@ namespace GxPress.Repository.Implement
             return await _repository.UpdateAsync(Q.Set(nameof(Entity.Group.IsWords), !group.IsWords)
                        .Where(nameof(Entity.Group.Id), groupId)) > 0;
         }
-
         public async Task<List<JobGroupResult>> ElasticSearchGroup()
         {
             var sql = "select a.Id,a.GuId,a.UserId,b.Id,b.Name,b.AvatarUrl,b.CreatedDate,c.Name from tede_middle a inner join tede_group b on a.MiddleId=b.Id inner join tede_user c on c.Id=b.UserId where a.FolderType=7 and a.IsUpload=0 order by a.CreatedDate desc limit 0,100";
@@ -550,5 +549,47 @@ namespace GxPress.Repository.Implement
             }
             return items;
         }
+        /// <summary>
+        /// 小组列表 搜索专用
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserGroupResult>> GetUserGroupListAsync(int userId)
+        {
+            var result = new List<UserGroupResult>();
+            string sql = $@"SELECT 
+                                b.*
+                            FROM
+                                tede_group_user a
+                                    INNER JOIN
+                                tede_group b ON a.GroupId = b.Id
+                            WHERE
+                                a.UserId = {userId}
+                            ORDER BY b.CreatedDate DESC";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var items = await connection
+                .QueryAsync<Entity.Group>(sql);
+            result.Add(new UserGroupResult
+            {
+                Id = -1,
+                Name = "全网公开"
+            });
+            result.Add(new UserGroupResult
+            {
+                Id = -2,
+                Name = "我的小组"
+            });
+            foreach (var item in items)
+            {
+                result.Add(new UserGroupResult
+                {
+                    Id = item.Id,
+                    Name = item.Name
+                });
+            }
+            return result;
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/Note/NoteRepository.cs

@@ -88,6 +88,8 @@ namespace GxPress.Repository.Implement.Note
                     .QueryAsync<NotePageListRequest>(GetCollectionSql(request));
             foreach (var item in result)
             {
+                item.FolderName=item.FolderParentName;
+                item.FolderId=item.ParentId;
                 item.AvatarUrl = StringUtils.AddDomainMin(item.AvatarUrl);
             }
             pagedList.Items = result;

gx_api/GxPress/Repository/GxPress.Repository.Implement/TopicRepository.cs

@@ -217,7 +217,7 @@ namespace GxPress.Repository.Implement
             var topicConst = AllTypeConst.Topic.GetHashCode();
             var result = new PagedList<TopicListPageResult>();
             var sqlStr = "";
-            if (request.GroupId == 0)
+            if (request.GroupIds.Count() == 0)
             {
                 sqlStr += $@" AND a.GroupId IN (SELECT 
                                         GroupId
@@ -226,14 +226,33 @@ namespace GxPress.Repository.Implement
                                     WHERE
                                         UserId ={request.UserId})";
             }
-            if (request.GroupId > 0)
+            if (request.GroupIds.Count > 0)
             {
-                sqlStr += $@" AND a.GroupId IN (SELECT 
+                var groupIds = new List<int>();
+                foreach (var item in request.GroupIds)
+                {
+                    if (item > 0)
+                        groupIds.Add(item);
+                    //全网
+                    if (item == -1)
+                        groupIds.AddRange(await GetPublicGroupAsync());
+                    //我的小组
+                    if (item == -2)
+                        groupIds.AddRange(await GetIntoGroupAsync(request.UserId));
+                }
+                var groupIdStr = string.Empty;
+                foreach (var item in groupIds)
+                    groupIdStr += $"{item},";
+                if (!string.IsNullOrEmpty(groupIdStr))
+                {
+                    groupIdStr = groupIdStr.Remove(groupIdStr.Length - 1, 1);
+                    sqlStr += $@" AND a.GroupId IN (SELECT 
                                         GroupId
                                     FROM
                                         tede_group_user
                                     WHERE
-                                        UserId ={request.UserId} AND GroupId = {request.GroupId}  )";
+                                        UserId ={request.UserId} AND GroupId In ({groupIdStr}))";
+                }
             }
             if (!string.IsNullOrEmpty(request.Key))
             {
@@ -352,7 +371,32 @@ namespace GxPress.Repository.Implement
             result.Total = await connection.ExecuteScalarAsync<int>(countSql);
             return result;
         }
-
+        /// <summary>
+        /// 获取共享小组
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<int>> GetPublicGroupAsync()
+        {
+            string sql = @"select Id from tede_group where IsShow=1";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            var result = await connection.QueryAsync<int>(sql);
+            return result;
+        }
+        /// <summary>
+        /// 我加入的小组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<int>> GetIntoGroupAsync(int userId)
+        {
+            string sql = $"select a.Id from tede_group a inner join tede_group_user b on a.Id=b.GroupId where b.UserId={userId}";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            return await connection.QueryAsync<int>(sql);
+        }
         /// <summary>
         /// 根据小组ID获取话题数量
         /// </summary>

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

@@ -96,5 +96,11 @@ namespace GxPress.Repository.Interface
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<IEnumerable<LatelyGroupDetailResult>> GetLatelyGroupDetailResultAsync(int userId);
+        /// <summary>
+        /// 小组列表 搜索专用
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<UserGroupResult>> GetUserGroupListAsync(int userId);
     }
 }