1

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

@@ -394,5 +394,13 @@ namespace GxPress.Api.AppControllers
         {
             return await fileLibraryRepository.GetFileLibraryByUserIdAsync(_loginContext.AccountId);
         }
+          /// <summary>
+        /// 获取用户的通讯录
+        /// </summary>
+        /// <returns></returns>
+         [HttpGet("user-link")]
+        public async Task<UserLinkResult> GetUserLinkResultAsync(){
+            return await _userService.GetUserLinkResultAsync(_loginContext.AccountId);
+        }
     }
 }

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

@@ -57,7 +57,7 @@ namespace GxPress.Api.WebControllers
         private readonly IFeedbackRepository _feedbackRepository;
         public UserController(IUserRepository userRepository, IOptions<JwtOptions> jwtOptions,
             ILogger<UserController> logger, IDepartmentRepository departmentRepository, ILoginContext loginContext,
-            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository,IFeedbackRepository _feedbackRepository)
+            IUserService userService, IFileLibraryRepository fileLibraryRepository, IDistributedCache cache, IUserLoginRepository userLoginRepository, IAddressBookGroupRepository addressBookGroupRepository, IAddressBookGroupUserRepository _addressBookGroupUserRepository, IFeedbackRepository _feedbackRepository)
         {
             _userRepository = userRepository;
             _departmentRepository = departmentRepository;
@@ -70,7 +70,7 @@ namespace GxPress.Api.WebControllers
             this.userLoginRepository = userLoginRepository;
             this.addressBookGroupRepository = addressBookGroupRepository;
             this._addressBookGroupUserRepository = _addressBookGroupUserRepository;
-            this._feedbackRepository=_feedbackRepository;
+            this._feedbackRepository = _feedbackRepository;
         }
         /// <summary>
         /// 登录

gx_api/GxPress/Model/GxPress.Entity/UserMiddle/UserMiddle.cs

@@ -15,7 +15,7 @@ namespace GxPress.Entity.UserMiddle
         [DataColumn]
         public int MiddleType { get; set; }
         /// <summary>
-        ///  用户中间类型 0 用户 1 部门 3 自建分组
+        ///  用户中间类型 0 用户 1 部门 2系统 3 自建分组
         /// </summary>
         /// <value></value>
         [DataColumn]
@@ -27,6 +27,12 @@ namespace GxPress.Entity.UserMiddle
         [DataColumn]
         public int SourceId { get; set; }
         /// <summary>
+        /// 对应来源ID 1 我的小组 2群聊
+        /// </summary>
+        /// <value></value>
+        [DataColumn]
+        public int SourceTypeValue { get; set; }
+        /// <summary>
         /// 来源名称
         /// </summary>
         /// <value></value>

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

@@ -1,3 +1,5 @@
+using System.Collections.Generic;
+
 namespace GxPress.Result.User
 {
     /// <summary>
@@ -46,9 +48,63 @@ namespace GxPress.Result.User
         /// 角色ID
         /// </summary>
         public int RoleId { get; set; }
-         /// <summary>
+        /// <summary>
         /// 头像地址
         /// </summary>
         public string AvatarUrl { get; set; }
     }
+    /// <summary>
+    /// 用户通讯录  
+    /// </summary>
+    public class UserLinkResult
+    {
+        /// <summary>
+        /// 用户通讯录
+        /// </summary>
+        /// <value></value>
+        public List<UserLinkModelResult> Items { get; set; }
+    }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UserLinkModelResult
+    {
+        /// <summary>
+        /// 用户通讯录  0 用户 1 单位通讯录 2系统通讯录 3 自建通讯录
+        /// </summary>
+        /// <value></value>
+        public int TypeId { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <value></value>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 数据ID
+        /// </summary>
+        /// <value></value>
+        public List<UserLinkModelAttributeResult> Items { get; set; }
+    }
+    /// <summary>
+    /// 
+    /// </summary>
+    public class UserLinkModelAttributeResult
+    {
+        /// <summary>
+        /// Id
+        /// </summary>
+        /// <value></value>
+        public int Id { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        /// <value></value>
+        public string Name { get; set; }
+        /// <summary>
+        /// 1 我的小组 2我的群聊 3我的课程
+        /// </summary>
+        /// <value></value>
+        public int TypeValue { get; set; }
+    }
 }

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

@@ -22,6 +22,7 @@ using GxPress.Repository.Interface.WorkFlow;
 using GxPress.EnumConst;
 using GxPress.Request.App.Flow;
 using GxPress.Repository.Interface.WaitHandle;
+using GxPress.Request.AddressBookGroup;
 
 namespace GxPress.Service.Implement
 {
@@ -343,7 +344,62 @@ namespace GxPress.Service.Implement
             result.WaitHandleUFinishCount = await waitHandleRepository.GetUFinishAsync(userId);
             return result;
         }
-
-
+        /// <summary>
+        /// 获取用户的通讯录
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<UserLinkResult> GetUserLinkResultAsync(int userId)
+        {
+            //获取用户
+            var user = await _userRepository.GetAsync(userId);
+            //单位通讯录
+            var userLinkResult = new List<UserLinkModelResult>();
+            if (user.DepartmentId > 0)
+            {
+                var departments = await _departmentRepository.GetAllAsync(Q.Where(nameof(Entity.Department.ParentId), 0));
+                var userLinkModelAttributeResult = new List<UserLinkModelAttributeResult>();
+                foreach (var item in departments)
+                    userLinkModelAttributeResult.Add(new UserLinkModelAttributeResult { Id = item.Id, Name = item.Name });
+                userLinkResult.Add(new UserLinkModelResult
+                {
+                    TypeId = 1,
+                    Name = "单位通讯录",
+                    Items = userLinkModelAttributeResult
+                });
+            }
+            //系统通讯录
+            userLinkResult.Add(
+              new UserLinkModelResult
+              {
+                  TypeId = 2,
+                  Name = "系统通讯录",
+                  Items = new List<UserLinkModelAttributeResult>{
+                        new UserLinkModelAttributeResult{Id=0,Name="我的小组",TypeValue=1},
+                        new UserLinkModelAttributeResult{Id=0,Name="我的群聊",TypeValue=2},
+                        new UserLinkModelAttributeResult{Id=0,Name="我的课程",TypeValue=3}
+                  }
+              }
+          );
+            //自建通讯录
+            var addressBookGroupList = await _addressBookGroupRepository.GetAddressBookGroupListAsync(
+                new AddressBookGroupSearchRequest { ParendId = 0, UserId = userId });
+            var systemLinkModelAttributeResults = new List<UserLinkModelAttributeResult>();
+            foreach (var item in addressBookGroupList)
+                systemLinkModelAttributeResults.Add(new UserLinkModelAttributeResult { Id = item.Id, Name = item.GroupName });
+            userLinkResult.Add(
+                new UserLinkModelResult
+                {
+                    TypeId = 3,
+                    Name = "自建通讯录",
+                    Items = systemLinkModelAttributeResults
+                }
+            );
+            var result = new UserLinkResult()
+            {
+                Items = userLinkResult
+            };
+            return result;
+        }
     }
 }

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

@@ -11,7 +11,7 @@ using GxPress.Result.User;
 
 namespace GxPress.Service.Interface
 {
-   public interface IUserService:IService
+    public interface IUserService : IService
     {
         /// <summary>
         /// 根据部门或者自建ID获取用户
@@ -26,7 +26,7 @@ namespace GxPress.Service.Interface
         /// <param name="userId"></param>
         /// <param name="blackUserId"></param>
         /// <returns></returns>
-        Task<UserDetail> GetUserByIdAsync(int userId,int blackUserId);
+        Task<UserDetail> GetUserByIdAsync(int userId, int blackUserId);
 
         /// <summary>
         /// 生成excel
@@ -49,6 +49,13 @@ namespace GxPress.Service.Interface
         /// <returns></returns>
         Task<UserCountResult> GetUserCountAsync(int userId);
 
-       Task<PagedList<User>> GetPageListAsync(UserPageSearchRequest request);
+        Task<PagedList<User>> GetPageListAsync(UserPageSearchRequest request);
+
+        /// <summary>
+        /// 获取用户的通讯录
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        Task<UserLinkResult> GetUserLinkResultAsync(int userId);
     }
 }