1

gx_api/GxPress/Api/GxPress.Api/AppControllers/AdminVerifyController.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.Auth;
+using GxPress.Request._AdminVerify;
 using GxPress.Request.App.AdminVerify;
 using GxPress.Result.App.AdminVerify;
 using GxPress.Service.Interface.AdminVerify;
@@ -19,7 +20,7 @@ namespace GxPress.Api.AppControllers
     {
         private readonly IAdminVerifyService _adminVerifyService;
         private readonly ILoginContext _loginContext;
-        public AdminVerifyController(IAdminVerifyService adminVerifyService,ILoginContext loginContext)
+        public AdminVerifyController(IAdminVerifyService adminVerifyService, ILoginContext loginContext)
         {
             _adminVerifyService = adminVerifyService;
             _loginContext = loginContext;
@@ -65,5 +66,16 @@ namespace GxPress.Api.AppControllers
         {
             return await _adminVerifyService.GetUDisposeCount(_loginContext.AccountId);
         }
+        /// <summary>
+        /// 添加好友
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [HttpPost("add-friend")]
+        public async Task<bool> AddFriendAsync(AdminVerifyInFriendsRequest request)
+        {
+            request.UserId = _loginContext.AccountId;
+            return await _adminVerifyService.AddFriendAsync(request);
+        }
     }
 }

gx_api/GxPress/Api/GxPress.Api/AppControllers/AppFlowController.cs

@@ -91,7 +91,7 @@ namespace GxPress.Api.AppControllers
             if (flow.Id > 0)
                 await _flowService.DeleteAsync(flow.Id);
             flow.Id = await _flowService.AddAsync(flow);
-            await _flowService.AddInboxAsyc(flow);
+            //await _flowService.AddInboxAsyc(flow);
             return flow;
         }
 

gx_api/GxPress/Api/GxPress.Api/AppControllers/UserController.cs

@@ -50,7 +50,7 @@ namespace GxPress.Api.AppControllers
 
         public UserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<UserController> logger, IDepartmentRepository departmentRepository, ILoginContext loginContext,
-            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository,IUserMiddleService userMiddleService)
+            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IUserMiddleService userMiddleService)
         {
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
@@ -61,7 +61,7 @@ namespace GxPress.Api.AppControllers
             this.fileLibraryRepository = fileLibraryRepository;
             _cache = cache;
             this.userLoginRepository = userLoginRepository;
-            this.userMiddleService=userMiddleService;
+            this.userMiddleService = userMiddleService;
         }
         /// <summary>
         /// 登录
@@ -416,7 +416,16 @@ namespace GxPress.Api.AppControllers
         [HttpPost("user-middle")]
         public async Task<List<Entity.User>> FindUsersAsync(UserMiddles userMiddles)
         {
-            return await userMiddleService.FindUsersAsync(userMiddles.Item,_loginContext.AccountId);
+            return await userMiddleService.FindUsersAsync(userMiddles.Item, _loginContext.AccountId);
+        }
+        /// <summary>
+        /// 查询不是好友的用户
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("find-friends/{keyword}")]
+        public async Task<IEnumerable<UserInfoResult>> FindUserInfoNoFriendsResultAsync(string keyword)
+        {
+            return await _userService.FindUserInfoNoFriendsResultAsync(_loginContext.AccountId, keyword);
         }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/AddressBookGroupController.cs

@@ -98,7 +98,7 @@ namespace GxPress.Api.AppControllers
         /// 自建分组移动排序
         /// </summary>
         /// <param name="request"></param>
-        /// <returns></returns>
+        /// <returns></returns>z
         [HttpPost("sort")]
         public async Task<bool> Sort(AddressBookGroupSortRequest request)
         {

gx_api/GxPress/Api/GxPress.Api/WebControllers/UserController.cs

@@ -469,5 +469,14 @@ namespace GxPress.Api.WebControllers
         {
             return await _userService.GetUserLinkResultAsync(_loginContext.AccountId);
         }
+        /// <summary>
+        /// 查询不是好友的用户
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet("find-friends/{keyword}")]
+        public async Task<IEnumerable<UserInfoResult>> FindUserInfoNoFriendsResultAsync(string keyword)
+        {
+            return await _userService.FindUserInfoNoFriendsResultAsync(_loginContext.AccountId, keyword);
+        }
     }
 }

gx_api/GxPress/Api/GxPress.Api/WebControllers/WebFlowController.cs

@@ -91,7 +91,7 @@ namespace GxPress.Api.WebControllers
             if (flow.Id > 0)
                 await _flowService.DeleteAsync(flow.Id);
             flow.Id = await _flowService.AddAsync(flow);
-            await _flowService.AddInboxAsyc(flow);
+            //await _flowService.AddInboxAsyc(flow);
             return flow;
         }
 

gx_api/GxPress/Model/GxPress.Entity/AdminVerify.cs

@@ -23,7 +23,7 @@ namespace GxPress.Entity
         public int DisposeType { get; set; }
 
         /// <summary>
-        /// 群主ID
+        /// 群主ID 针对人的ID
         /// </summary>
         [DataColumn]
         public int AdminId { get; set; }
@@ -72,5 +72,11 @@ namespace GxPress.Entity
         /// </summary>
         [DataColumn]
         public string IsDelete { get; set; }
+
+        /// <summary>
+        /// 自己分组ID
+        /// </summary>
+        [DataColumn]
+        public int AddressBookGroupId { get; set; }
     }
 }

gx_api/GxPress/Model/GxPress.Entity/Friends.cs

@@ -0,0 +1,30 @@
+using Datory.Annotations;
+
+namespace GxPress.Entity
+{
+    /// <summary>
+    /// 好友列表
+    /// </summary>
+    [DataTable("tede_friends")]
+    public class Friends : Datory.Entity
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int UserId { get; set; }
+        /// <summary>
+        /// 好友ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int FriendsUserId { get; set; }
+        /// <summary>
+        /// 自建小组ID
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int AddressBookGroupId { get; set; }
+    }
+}

gx_api/GxPress/Model/GxPress.EnumConst/GroupTypeConst.cs

@@ -13,7 +13,9 @@ namespace GxPress.EnumConst
         /// <summary>
         /// 小组
         /// </summary>
-        Group=3
+        Group=3,
+        
+        Friends=4
 
     }
 }

gx_api/GxPress/Model/GxPress.Request/ AdminVerify/ AdminVerifyRequest.cs

@@ -0,0 +1,37 @@
+namespace GxPress.Request._AdminVerify
+{
+    /// <summary>
+    /// 
+    /// </summary>
+    public class AdminVerifyRequest
+    {
+
+    }
+    /// <summary>
+    /// 添加好友
+    /// </summary>
+    public class AdminVerifyInFriendsRequest
+    {
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        /// <value></value>
+        public int UserId { get; set; }
+        /// <summary>
+        /// 好友ID
+        /// </summary>
+        /// <value></value>
+        public int FriendsUserId { get; set; }
+        /// <summary>
+        /// 自建小组ID
+        /// </summary>
+        /// <value></value>
+        public int AddressBookGroupId { get; set; }
+        /// <summary>
+        /// 备注信息
+        /// </summary>
+        /// <value></value>
+        public string Remark { get; set; }
+    }
+
+}

gx_api/GxPress/Model/GxPress.Result/User/UserResult.cs

@@ -63,6 +63,11 @@ namespace GxPress.Result.User
         /// </summary>
         /// <value></value>
         public List<UserLinkModelResult> Items { get; set; }
+        /// <summary>
+        /// 好友
+        /// </summary>
+        /// <value></value>
+        public IEnumerable<UserInfoResult> FriendUsers { get; set; }
     }
     /// <summary>
     /// 
@@ -107,4 +112,5 @@ namespace GxPress.Result.User
         /// <value></value>
         public int TypeValue { get; set; }
     }
+
 }

gx_api/GxPress/Repository/GxPress.Repository.Implement/DepartmentUser/DepartmentUserRepository.cs

@@ -42,6 +42,24 @@ namespace GxPress.Repository.Implement.DepartmentUser
         {
             return await _repository.GetAllAsync<int>(Q.Where(nameof(Entity.DepartmentUser.DepartmentId), departmentId).Select(nameof(Entity.DepartmentUser.UserId)));
         }
+         /// <summary>
+        /// 获取部门下面的所有用户
+        /// </summary>
+        /// <param name="departmentId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<int>> GetUserIdsAsync()
+        {
+            return await _repository.GetAllAsync<int>(Q.Select(nameof(Entity.DepartmentUser.UserId)).GroupBy(nameof(Entity.DepartmentUser.UserId)));
+        }
+        /// <summary>
+        /// 判断是否有部门
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<bool> IsExistsAsync(int userId)
+        {
+            return await _repository.ExistsAsync(Q.Where(nameof(Entity.DepartmentUser.UserId), userId));
+        }
         /// <summary>
         /// 根据用户D获取部门ID
         /// </summary>

gx_api/GxPress/Repository/GxPress.Repository.Implement/Friends/FriendsRepository.cs

@@ -0,0 +1,80 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AutoMapper;
+using Datory;
+using GxPress.Common.AppOptions;
+using GxPress.Common.Tools;
+using GxPress.Repository.Interface.Friends;
+using Microsoft.Extensions.Caching.Distributed;
+using Microsoft.Extensions.Options;
+
+namespace GxPress.Repository.Implement.Friends
+{
+    public class FriendsRepository : IFriendsRepository
+    {
+        private readonly Repository<Entity.Friends> _repository;
+        private readonly IMapper _mapper;
+        private readonly IDistributedCache _cache;
+        public FriendsRepository(IOptionsMonitor<DatabaseOptions> dbOptionsAccessor, IMapper mapper, IDistributedCache cache)
+        {
+            var databaseType = StringUtils.ToEnum<DatabaseType>(dbOptionsAccessor.CurrentValue.DatabaseType, DatabaseType.MySql);
+            var database = new Database(databaseType, dbOptionsAccessor.CurrentValue.ConnectionString);
+            _mapper = mapper;
+            _cache = cache;
+            _repository = new Repository<Entity.Friends>(database);
+        }
+        public IDatabase Database => _repository.Database;
+        public string TableName => _repository.TableName;
+        public List<TableColumn> TableColumns => _repository.TableColumns;
+        /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public async Task<int> AddAsync(Entity.Friends model)
+        {
+            return await _repository.InsertAsync(model);
+        }
+        /// <summary>
+        /// 删除我的好友
+        /// </summary>
+        /// <param name="friendsIds"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<bool> DeleteAsync(IEnumerable<int> friendsIds, int userId)
+        {
+            return await _repository.DeleteAsync(Q.Where(nameof(Entity.Friends.UserId), userId).WhereIn(nameof(Entity.Friends.FriendsUserId), friendsIds)) > 0;
+        }
+        /// <summary>
+        /// 获取好友数据
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="addressBookGroupId"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<int>> GetFriendsIdsAsync(int userId, int addressBookGroupId)
+        {
+            var query = Q.NewQuery();
+            query.Select(nameof(Entity.Friends.FriendsUserId));
+            query.Where(nameof(Entity.Friends.UserId), userId);
+            if (addressBookGroupId >= 0)
+                query.Where(nameof(Entity.Friends.AddressBookGroupId), addressBookGroupId);
+            return await _repository.GetAllAsync<int>(query);
+        }
+
+        /// <summary>
+        /// 好友移动到自己分组
+        /// </summary>
+        /// <param name="friendsUserId"></param>
+        /// <param name="userId"></param>
+        /// <param name="addressBookGroupId"></param>
+        /// <returns></returns>
+        public async Task<bool> UpdateAddressBookGroupId(IEnumerable<int> friendsUserId, int userId, int addressBookGroupId)
+        {
+            var query = Q.NewQuery();
+            query.Set(nameof(Entity.Friends.AddressBookGroupId), addressBookGroupId);
+            query.WhereIn(nameof(Entity.Friends.FriendsUserId), friendsUserId);
+            query.Where(nameof(Entity.Friends.UserId), userId);
+            return await _repository.UpdateAsync(query) > 0;
+        }
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Implement/UserRepository.cs

@@ -113,9 +113,9 @@ namespace GxPress.Repository.Implement
             var user = await _repository.GetAsync(id);
             return user;
         }
-         public async Task<UserInfoResult> GetUserInfoAsync(int id)
+        public async Task<UserInfoResult> GetUserInfoAsync(int id)
         {
-            var user = await _repository.GetAsync<UserInfoResult>(Q.Where(nameof(User.Id),id));
+            var user = await _repository.GetAsync<UserInfoResult>(Q.Where(nameof(User.Id), id));
             return user;
         }
         public async Task<User> GetAsync(SqlKata.Query query)
@@ -973,6 +973,32 @@ namespace GxPress.Repository.Implement
             result.Items = items.Select(n => _mapper.Map<UserDetail>(n));
             return result;
         }
-
+        /// <summary>
+        /// 根据用户ID获取用户信息
+        /// </summary>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserInfoResult>> GetUserInfoResultsAsync(IEnumerable<int> userIds)
+        {
+            return await _repository.GetAllAsync<UserInfoResult>(Q.WhereIn(nameof(User.Id), userIds));
+        }
+        /// <summary>
+        /// 获取不是好友的用户 排除部门
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserInfoResult>> GetUserInfoNoFriendsResults(string keyword, IEnumerable<int> userIds)
+        {
+            var query = Q.NewQuery();
+            query.WhereNotIn(nameof(User.Id), userIds);
+            if (!string.IsNullOrEmpty(keyword))
+            {
+                query.WhereLike(nameof(User.Name), $"%{keyword}%");
+                query.OrWhereLike(nameof(User.Email), $"%{keyword}%");
+                query.OrWhereLike(nameof(User.Phone), $"%{keyword}%");
+            }
+            return await _repository.GetAllAsync<UserInfoResult>(query);
+        }
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/DepartmentUser/IDepartmentUserRepository.cs

@@ -31,5 +31,17 @@ namespace GxPress.Repository.Interface.DepartmentUser
         /// <param name="departmentId"></param>
         /// <returns></returns>
         Task<IEnumerable<int>> GetDepartmentIdsAsync(int userId);
+        /// <summary>
+        /// 获取部门下面的所有用户
+        /// </summary>
+        /// <param name="departmentId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<int>> GetUserIdsAsync();
+        /// <summary>
+        /// 判断是否有部门
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<bool> IsExistsAsync(int userId);
     }
 }

gx_api/GxPress/Repository/GxPress.Repository.Interface/Friends/IFriendsRepository.cs

@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Datory;
+
+namespace GxPress.Repository.Interface.Friends
+{
+    public interface IFriendsRepository:IRepository
+    {
+         /// <summary>
+        /// 添加
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        Task<int> AddAsync(Entity.Friends model);
+        /// <summary>
+        /// 删除我的好友
+        /// </summary>
+        /// <param name="friendsIds"></param>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<bool> DeleteAsync(IEnumerable<int> friendsIds, int userId);
+        /// <summary>
+        /// 获取好友数据
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <param name="addressBookGroupId"></param>
+        /// <returns></returns>
+        Task<IEnumerable<int>> GetFriendsIdsAsync(int userId, int addressBookGroupId);
+
+        /// <summary>
+        /// 好友移动到自己分组
+        /// </summary>
+        /// <param name="friendsUserId"></param>
+        /// <param name="userId"></param>
+        /// <param name="addressBookGroupId"></param>
+        /// <returns></returns>
+        Task<bool> UpdateAddressBookGroupId(IEnumerable<int> friendsUserId, int userId, int addressBookGroupId);
+    }
+}

gx_api/GxPress/Repository/GxPress.Repository.Interface/IUserRepository.cs

@@ -242,5 +242,19 @@ namespace GxPress.Repository.Interface
         Task<PagedList<UserDetail>> GetUserVipDetail(UserSearchVipRequest request);
         Task<bool> UpdateDisableAsync(UserUpdateDisableRequest request);
         Task<int> GetUserCount(string beginTime, string endTime);
+
+        /// <summary>
+        /// 根据用户ID获取用户信息
+        /// </summary>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        Task<IEnumerable<UserInfoResult>> GetUserInfoResultsAsync(IEnumerable<int> userIds);
+        /// <summary>
+        /// 获取不是好友的用户 排除部门
+        /// </summary>
+        /// <param name="keyword"></param>
+        /// <param name="userIds"></param>
+        /// <returns></returns>
+        Task<IEnumerable<UserInfoResult>> GetUserInfoNoFriendsResults(string keyword, IEnumerable<int> userIds);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Implement/AdminVerify/AdminVerifyService.AddFriends.cs

@@ -0,0 +1,64 @@
+using System.Threading.Tasks;
+using GxPress.EnumConst;
+using GxPress.Request._AdminVerify;
+using System.Transactions;
+namespace GxPress.Service.Implement.AdminVerify
+{
+    public partial class AdminVerifyService
+    {
+        /// <summary>
+        /// 添加好友
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public async Task<bool> AddFriendAsync(AdminVerifyInFriendsRequest request)
+        {
+            try
+            {
+                using (var transactions = new TransactionScope())
+                {
+                    //获取用户信息
+                    var user = await _userRepository.GetAsync(request.FriendsUserId);
+                    var entity = new Entity.AdminVerify()
+                    {
+                        //
+                        VerifyType = GroupTypeConst.Friends,
+                        DisposeType = 0,
+                        AdminId = request.FriendsUserId,
+                        UserId = request.UserId,
+                        SourceId = 0,
+                        Name = user.Name,
+                        AvatarUrl = user.AvatarUrl,
+                        Remark = request.Remark,
+                        SourceType = 0,
+                        AddressBookGroupId = request.AddressBookGroupId
+                    };
+                    // await _adminVerifyRepository.InsertAsync(entity);
+                    // //获取用户信息
+                    // user = await _userRepository.GetAsync(request.UserId);
+                    // entity = new Entity.AdminVerify()
+                    // {
+                    //     //
+                    //     VerifyType = GroupTypeConst.Friends,
+                    //     DisposeType = 0,
+                    //     AdminId = request.UserId,
+                    //     UserId = request.FriendsUserId,
+                    //     SourceId = 0,
+                    //     Name = user.Name,
+                    //     AvatarUrl = user.AvatarUrl,
+                    //     Remark = request.Remark,
+                    //     SourceType = 0,
+                    //     AddressBookGroupId = 0
+                    // };
+                    // await _adminVerifyRepository.InsertAsync(entity);
+                    transactions.Complete();
+                }
+            }
+            catch
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+}

gx_api/GxPress/Service/GxPress.Service.Implement/AdminVerify/AdminVerifyService.cs

@@ -8,6 +8,8 @@ using GxPress.Entity;
 using GxPress.EnumConst;
 using GxPress.Repository.Interface;
 using GxPress.Repository.Interface.AdminVerify;
+using GxPress.Repository.Interface.Friends;
+using GxPress.Request.AddressBookGroupUser;
 using GxPress.Request.App.GroupUser;
 using GxPress.Result.App.AdminVerify;
 using GxPress.Service.Interface;
@@ -17,7 +19,7 @@ using GxPress.Service.Interface.Middle;
 
 namespace GxPress.Service.Implement.AdminVerify
 {
-    public class AdminVerifyService : IAdminVerifyService
+    public partial class AdminVerifyService : IAdminVerifyService
     {
         private readonly IAdminVerifyRepository _adminVerifyRepository;
         private readonly IUserRepository _userRepository;
@@ -30,11 +32,12 @@ namespace GxPress.Service.Implement.AdminVerify
         private readonly IGroupUserRepository _groupUserRepository;
         private readonly IGroupChatUserRepository _groupChatUserRepository;
         private readonly IMapper _mapper;
-
+        private readonly IFriendsRepository friendsRepository;
+        private readonly IAddressBookGroupUserRepository addressBookGroupUserRepository;
         public AdminVerifyService(IAdminVerifyRepository adminVerifyRepository, IUserRepository userRepository,
             IDepartmentRepository departmentRepository, IGroupChatRepository groupChatRepository,
             IGroupService groupService, IMiddleService middleService, IGroupChatUserService groupChatUserService,
-            IGroupRepository groupRepository, IMapper mapper, IGroupUserRepository groupUserRepository, IGroupChatUserRepository groupChatUserRepository)
+            IGroupRepository groupRepository, IMapper mapper, IGroupUserRepository groupUserRepository, IGroupChatUserRepository groupChatUserRepository, IFriendsRepository friendsRepository, IAddressBookGroupUserRepository addressBookGroupUserRepository)
         {
             _adminVerifyRepository = adminVerifyRepository;
             _userRepository = userRepository;
@@ -47,6 +50,8 @@ namespace GxPress.Service.Implement.AdminVerify
             _mapper = mapper;
             _groupUserRepository = groupUserRepository;
             _groupChatUserRepository = groupChatUserRepository;
+            this.friendsRepository = friendsRepository;
+            this.addressBookGroupUserRepository = addressBookGroupUserRepository;
         }
 
         /// <summary>
@@ -82,9 +87,29 @@ namespace GxPress.Service.Implement.AdminVerify
                         request.UserIds.Add(adminVerify.UserId);
                     await _groupService.AddUsersAsync(request);
                 }
+                //好友
+                if (adminVerify.VerifyType == GroupTypeConst.Friends)
+                {
+                    //加入好友
+                    await friendsRepository.AddAsync(new Friends
+                    {
+                        UserId = adminVerify.UserId,
+                        FriendsUserId = adminVerify.AdminId,
+                        AddressBookGroupId = adminVerify.AddressBookGroupId
+                    });
+                    //添加自建分组
+                    if (adminVerify.AddressBookGroupId > 0)
+                    {
+                        await addressBookGroupUserRepository.InsertAsync(new AddressBookGroupUserInRequest
+                        {
+                            AddressBookGroupId = adminVerify.AddressBookGroupId,
+                            UserId = adminVerify.AdminId
+                        });
+                    }
+                }
             }
             //修改状态
-            await _adminVerifyRepository.UpdateAsync(Q.Where(nameof(Entity.AdminVerify.AdminId), adminVerify.AdminId).Where(nameof(Entity.AdminVerify.UserId), adminVerify.UserId).Where(nameof(Entity.AdminVerify.SourceType), adminVerify.SourceType).Where(nameof(Entity.AdminVerify.SourceId), adminVerify.SourceId).Set(nameof(Entity.AdminVerify.DisposeType), AdminVerifyTypeConst.Approve.GetHashCode()));
+            // await _adminVerifyRepository.UpdateAsync(Q.Where(nameof(Entity.AdminVerify.AdminId), adminVerify.AdminId).Where(nameof(Entity.AdminVerify.UserId), adminVerify.UserId).Where(nameof(Entity.AdminVerify.SourceType), adminVerify.SourceType).Where(nameof(Entity.AdminVerify.SourceId), adminVerify.SourceId).Set(nameof(Entity.AdminVerify.DisposeType), AdminVerifyTypeConst.Approve.GetHashCode()));
             await _adminVerifyRepository.UpdateAsync(Q.Where(nameof(Entity.AdminVerify.AdminId), adminVerify.UserId).Where(nameof(Entity.AdminVerify.UserId), adminVerify.AdminId).Where(nameof(Entity.AdminVerify.SourceType), adminVerify.SourceType).Where(nameof(Entity.AdminVerify.SourceId), adminVerify.SourceId).Set(nameof(Entity.AdminVerify.DisposeType), disposeTyeConst.GetHashCode()));
             return true;
         }

gx_api/GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Inbox.cs

@@ -26,7 +26,7 @@ namespace GxPress.Service.Implement
             var middle = new Entity.Middle.Middle
             {
                 MiddleId = flow.Id,
-                FolderType = GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode(),
+                FolderType = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode(),
                 IsTop = false,
                 AttributeValue = 1,
                 ParentId = 0,
@@ -51,7 +51,7 @@ namespace GxPress.Service.Implement
                 middle = new Entity.Middle.Middle
                 {
                     MiddleId = flow.Id,
-                    FolderType = GxPress.EnumConst.FolderTypeConst.Notice.GetHashCode(),
+                    FolderType = GxPress.EnumConst.AllTypeConst.Inbox.GetHashCode(),
                     IsTop = false,
                     AttributeValue = 1,
                     ParentId = 0,

gx_api/GxPress/Service/GxPress.Service.Implement/UserService.cs

@@ -24,6 +24,7 @@ using GxPress.Request.App.Flow;
 using GxPress.Repository.Interface.WaitHandle;
 using GxPress.Request.AddressBookGroup;
 using GxPress.Repository.Interface.DepartmentUser;
+using GxPress.Repository.Interface.Friends;
 
 namespace GxPress.Service.Implement
 {
@@ -41,9 +42,10 @@ namespace GxPress.Service.Implement
         private readonly IFlowTodoRepository _flowTodoRepository;
         private readonly IWaitHandleRepository waitHandleRepository;
         private readonly IDepartmentUserRepository departmentUserRepository;
+        private readonly IFriendsRepository friendsRepository;
         public UserService(IUserRepository userRepository, IDepartmentRepository departmentRepository,
             IAddressBookGroupRepository addressBookGroupRepository, IBlacklistUserRepository blacklistUserRepository,
-            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository, IDepartmentUserRepository departmentUserRepository)
+            IMapper mapper, IWebHostEnvironment webHostEnvironment, IRoleRepository roleRepository, IIMService imService, IFlowRepository flowRepository, IFlowTodoRepository flowTodoRepository, IWaitHandleRepository waitHandleRepository, IDepartmentUserRepository departmentUserRepository, IFriendsRepository friendsRepository)
         {
 
             _userRepository = userRepository;
@@ -58,6 +60,7 @@ namespace GxPress.Service.Implement
             _flowTodoRepository = flowTodoRepository;
             this.waitHandleRepository = waitHandleRepository;
             this.departmentUserRepository = departmentUserRepository;
+            this.friendsRepository = friendsRepository;
         }
 
         /// <summary>
@@ -406,9 +409,12 @@ namespace GxPress.Service.Implement
                     Items = systemLinkModelAttributeResults
                 }
             );
+            //获取用户好友
+            var userIds = await friendsRepository.GetFriendsIdsAsync(userId, 0);
             var result = new UserLinkResult()
             {
-                Items = userLinkResult
+                Items = userLinkResult,
+                FriendUsers = await _userRepository.GetUserInfoResultsAsync(userIds)
             };
             return result;
         }
@@ -475,5 +481,22 @@ namespace GxPress.Service.Implement
             result.DepartmentIds = await departmentUserRepository.GetDepartmentIdsAsync(id);
             return result;
         }
+        /// <summary>
+        /// 查询不是好友的用户
+        /// </summary>
+        /// <returns></returns>
+        public async Task<IEnumerable<UserInfoResult>> FindUserInfoNoFriendsResultAsync(int userId, string keyword)
+        {
+            var userIds = await friendsRepository.GetFriendsIdsAsync(userId, -1);
+            var userIdsList = userIds.ToList();
+            //判断是否有部门
+            if (await departmentUserRepository.IsExistsAsync(userId))
+                //获取部门数据
+                userIdsList.AddRange(await departmentUserRepository.GetUserIdsAsync());
+            var result = await _userRepository.GetUserInfoNoFriendsResults(keyword, userIdsList);
+            foreach (var item in result)
+                item.AvatarUrl = StringUtils.AddDomain(item.AvatarUrl);
+            return result;
+        }
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/AdminVerify/IAdminVerifyService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using GxPress.EnumConst;
+using GxPress.Request._AdminVerify;
 using GxPress.Result.App.AdminVerify;
 
 namespace GxPress.Service.Interface.AdminVerify
@@ -42,6 +43,11 @@ namespace GxPress.Service.Interface.AdminVerify
         /// <param name="userId"></param>
         /// <returns></returns>
         Task<int> GetUDisposeCount(int userId);
-       
+        /// <summary>
+        /// 添加好友
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        Task<bool> AddFriendAsync(AdminVerifyInFriendsRequest request);
     }
 }

gx_api/GxPress/Service/GxPress.Service.Interface/IUserService.cs

@@ -64,6 +64,11 @@ namespace GxPress.Service.Interface
         /// <param name="request"></param>
         /// <returns></returns>
         Task<bool> UpdateAsync(int id, UserInfoRequest request);
-         Task<UserInfoResult> GetUserInfoAsync(int id);
+        Task<UserInfoResult> GetUserInfoAsync(int id);
+        /// <summary>
+        /// 查询不是好友的用户
+        /// </summary>
+        /// <returns></returns>
+        Task<IEnumerable<UserInfoResult>> FindUserInfoNoFriendsResultAsync(int userId, string keyword);
     }
 }