1

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

@@ -94,6 +94,7 @@ namespace GxPress.Api.AppControllers
         [HttpPost("delete-user")]
         public async Task<bool> DeleteGroupUser(GroupUserDeRequest request)
         {
+            request.UserId = _loginContext.AccountId;
             return await _groupService.DeleteAsync(request);
         }
 
@@ -252,5 +253,16 @@ namespace GxPress.Api.AppControllers
         {
             return await _groupRepository.GetLatelyGroupDetailResultAsync(_loginContext.AccountId);
         }
+        /// <summary>
+        /// 小组转移
+        /// </summary>
+        /// <param name="request"></param>
+        /// /// <returns></returns>
+        [HttpPut("transfer")]
+        public async Task<bool> SetGroupTransferAsync(GroupTransferReqeust request)
+        {
+            request.UserId = _loginContext.AccountId;
+            return await _groupService.SetGroupTransferAsync(request);
+        }
     }
 }

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

@@ -256,5 +256,17 @@ namespace GxPress.Api.WebControllers
         {
             return await _groupRepository.GetLatelyGroupDetailResultAsync(_loginContext.AccountId);
         }
+
+        /// <summary>
+        /// 小组转移
+        /// </summary>
+        /// <param name="request"></param>
+        /// /// <returns></returns>
+        [HttpPut("transfer")]
+        public async Task<bool> SetGroupTransferAsync(GroupTransferReqeust request)
+        {
+            request.UserId = _loginContext.AccountId;
+            return await _groupService.SetGroupTransferAsync(request);
+        }
     }
 }

gx_api/GxPress/Model/GxPress.Request/App/Group/GroupInRequest.cs

@@ -78,4 +78,25 @@ namespace GxPress.Request.App.Group
         /// <value></value>
         public bool IsShow { get; set; }
     }
+    /// <summary>
+    /// 小组转移
+    /// </summary>
+    public class GroupTransferReqeust
+    {
+        /// <summary>
+        /// 小组ID
+        /// </summary>
+        /// <value></value>
+        public int GroupId{get;set;}
+        /// <summary>
+        /// 小组创建者
+        /// </summary>
+        /// <value></value>
+        public int UserId { get; set; }
+        /// <summary>
+        /// 转移者
+        /// </summary>
+        /// <value></value>
+        public int TransferUserId { get; set; }
+    }
 }

gx_api/GxPress/Model/GxPress.Request/App/GroupUser/GroupUserDeRequest.cs

@@ -17,5 +17,10 @@ namespace GxPress.Request.App.GroupUser
         /// 小组ID
         /// </summary>
         public int GroupId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <value></value>
+        public int UserId { get; set; }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/GroupUserRepository.cs

@@ -55,7 +55,11 @@ namespace GxPress.Repository.Implement
             return await _repository.UpdateAsync(Q.Set(nameof(GroupUser.GroupUserRoleId), request.RoleId)
                        .Where(nameof(GroupUser.Id), request.Id)) > 0;
         }
+        public async Task<bool> UpdateAsync(Entity.GroupUser groupUser)
+        {
 
+            return await _repository.UpdateAsync(groupUser);
+        }
         public async Task<bool> DeleteAsync(Query query)
         {
             return await _repository.DeleteAsync(query) > 0;
@@ -89,7 +93,14 @@ namespace GxPress.Repository.Implement
         {
             return await _repository.GetAsync(q);
         }
-
+        public async Task<int> CountAsync(int groupId)
+        {
+            string sql = $@"select count(1) from tede_group_user a inner join tede_user b on a.UserId=b.Id where a.GroupId={groupId}";
+            var databaseType = StringUtils.ToEnum<DatabaseType>(_databaseTypeStr, DatabaseType.MySql);
+            var database = new Database(databaseType, _connectionString);
+            var connection = database.GetConnection();
+            return await connection.ExecuteScalarAsync<int>(sql);
+        }
         public async Task<IEnumerable<GroupUser>> GetAllAsync(Query q)
         {
             return await _repository.GetAllAsync(q);

gx_api/GxPress/Repository/GxPress.Repository.Interface/IGroupUserRepository.cs

@@ -7,6 +7,7 @@ using GxPress.Request.App.GroupFolder;
 using GxPress.Request.App.GroupUser;
 using Datory;
 using GxPress.EnumConst;
+using SqlKata;
 
 namespace GxPress.Repository.Interface
 {
@@ -49,5 +50,7 @@ namespace GxPress.Repository.Interface
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<int> GetUserIntoGroupUserCountAsync(int userId);
+        Task<int> CountAsync(int groupId);
+        Task<bool> UpdateAsync(Entity.GroupUser groupUser);
     }
 }

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

@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Threading.Tasks;
 using Datory;
 using GxPress.Common.Exceptions;
 using GxPress.Entity;
 using GxPress.Request.App.GroupUser;
+using System.Transactions;
+using GxPress.EnumConst;
 
 namespace GxPress.Service.Implement.Group
 {
@@ -19,17 +18,56 @@ namespace GxPress.Service.Implement.Group
         public async Task<bool> DeleteAsync(GroupUserDeRequest request)
         {
             var group = await _groupRepository.GetAsync(request.GroupId);
-            // if (request.GroupUserIds.Contains(group.UserId))
-            //     throw new BusinessException("创建人不能删除");
-            await _groupUserRepository.DeleteAsync(Q.Where(nameof(GroupUser.GroupId), request.GroupId)
-                .WhereIn(nameof(GroupUser.UserId), request.GroupUserIds));
-            //删除小组会话界面
-            return await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), 7)
-                .Where(nameof(Entity.Middle.Middle.MiddleId), request.GroupId)
-                .WhereIn(nameof(Entity.Middle.Middle.UserId), request.GroupUserIds));
+            if (group == null)
+                throw new BusinessException("小组不存在！");
+            try
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    await _groupUserRepository.DeleteAsync(Q.Where(nameof(GroupUser.GroupId), request.GroupId)
+                                   .WhereIn(nameof(GroupUser.UserId), request.GroupUserIds));
+                    //删除小组会话界面
+                    await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Group.GetHashCode())
+                       .Where(nameof(Entity.Middle.Middle.MiddleId), request.GroupId)
+                       .WhereIn(nameof(Entity.Middle.Middle.UserId), request.GroupUserIds));
+                    transactionScope.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+        /// <summary>
+        /// 小组创建者退出小组
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="groupId"></param>
+        /// <returns></returns>
+        public async Task<bool> IsDeleteGroupAsync(int userId, int groupId)
+        {
+            var query = Q.NewQuery();
+            query.Where(nameof(Entity.GroupUser.UserId), userId);
+            query.Where(nameof(Entity.GroupUser.GroupId), groupId);
+            var groupUser = await _groupUserRepository.GetAsync(query);
+            var groupUserCount = await _groupUserRepository.CountAsync(groupId);
+            if (groupUser == null)
+                throw new BusinessException("用户不存在");
+            //删除小组和小组用户
+            if (groupUserCount == 1)
+            {
+                await _groupRepository.DeleteAsync(groupId);
+                await _groupUserRepository.DeleteAsync(Q.Where(nameof(GroupUser.GroupId), groupId));
+                query = Q.NewQuery();
+                query.Where(nameof(Entity.Middle.Middle.FolderType), AllTypeConst.Group.GetHashCode());
+                query.Where(nameof(Entity.Middle.Middle.MiddleId), groupId);
+                await _middleRepository.DeleteAsync(query);
+            }
+            if (groupUser.GroupUserRoleId == GroupUserRoleTyeConst.SuperAdmin)
+                throw new BusinessException("你的身份是小组创建者，请先转让小组给他人，然后才能退出小组！");
+            return true;
         }
-
-        
 
         /// <summary>
         /// 退出小组
@@ -42,13 +80,7 @@ namespace GxPress.Service.Implement.Group
             var group = await _groupRepository.GetAsync(groupId);
             if (group == null)
                 throw new BusinessException("小组不存在！");
-            // if (group.UserId == userId)
-            //     throw new BusinessException("创建人不能退出");
-            await _groupUserRepository.DeleteAsync(Q.Where(nameof(GroupUser.GroupId), groupId)
-                .Where(nameof(GroupUser.UserId), userId));
-            return await _middleRepository.DeleteAsync(Q.Where(nameof(Entity.Middle.Middle.FolderType), 7)
-                .Where(nameof(Entity.Middle.Middle.MiddleId), groupId)
-                .Where(nameof(Entity.Middle.Middle.UserId), userId));
+            return await IsDeleteGroupAsync(userId, groupId);
         }
     }
 }

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

@@ -266,5 +266,40 @@ namespace GxPress.Service.Implement.Group
             result.GroupTopicNumber = await _topicRepository.GetGroupTopicCountAsync(result.Id);
             return result;
         }
+        /// <summary>
+        /// 小组转移
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> SetGroupTransferAsync(GroupTransferReqeust request)
+        {
+            var group = await _groupRepository.GetAsync(request.GroupId);
+            if (group.UserId == request.UserId)
+            {
+                using (var transactionScope = new TransactionScope())
+                {
+                    var query = Q.NewQuery();
+                    query.Where(nameof(Entity.GroupUser.UserId), request.TransferUserId);
+                    query.Where(nameof(Entity.GroupUser.GroupId), request.GroupId);
+                    var groupUser = await _groupUserRepository.GetAsync(query);
+                    if (groupUser == null)
+                        throw new BusinessException("转移人不是该小组成员");
+                    groupUser.GroupUserRoleId = GroupUserRoleTyeConst.SuperAdmin;
+                    await _groupUserRepository.UpdateAsync(groupUser);
+                    //获取
+                    query = Q.NewQuery();
+                    query.Where(nameof(Entity.GroupUser.UserId), request.UserId);
+                    query.Where(nameof(Entity.GroupUser.GroupId), request.GroupId);
+                    groupUser = await _groupUserRepository.GetAsync(query);
+                    if (groupUser == null)
+                        throw new BusinessException("转移人不是该小组成员");
+                    groupUser.GroupUserRoleId = GroupUserRoleTyeConst.General;
+                    await _groupUserRepository.UpdateAsync(groupUser);
+                    transactionScope.Complete();
+                    return true;
+                }
+            }
+            throw new BusinessException("小组不是该用户创建者");
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/Topic/TopicService.cs

@@ -110,6 +110,8 @@ namespace GxPress.Service.Implement.Topic
             // result.Total = 10;
             foreach (var item in result.Items)
             {
+                if (string.IsNullOrEmpty(item.Title))
+                    item.Title = string.Empty;
                 if (string.IsNullOrWhiteSpace(item.UserName))
                 {
                     item.Content = "[]";

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

@@ -52,6 +52,12 @@ namespace GxPress.Service.Interface.Group
         /// </summary>
         /// <param name="categoryId"></param>
         /// <returns></returns>
-        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId,int userId);
+        Task<IEnumerable<Entity.Group>> GetAllAsync(int categoryId, int userId);
+        /// <summary>
+        /// 小组转移
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> SetGroupTransferAsync(GroupTransferReqeust request);
     }
 }