From 08e4573e195633041cb47e4261f02ffd830ae1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=87=AA=E5=B8=A6=E5=A4=A7=E4=BD=AC=E6=B0=94=E5=9C=BA?=
 <188633308@qq.com>
Date: Tue, 1 Jun 2021 10:21:07 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=89=A9=E5=B1=95userManager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Api/Ewide.Core/Manager/IUserManager.cs | 10 ++--
 Api/Ewide.Core/Manager/UserManager.cs  | 63 +++++++++++++++++++++++++-
 2 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/Api/Ewide.Core/Manager/IUserManager.cs b/Api/Ewide.Core/Manager/IUserManager.cs
index 658afd8..a9c9f42 100644
--- a/Api/Ewide.Core/Manager/IUserManager.cs
+++ b/Api/Ewide.Core/Manager/IUserManager.cs
@@ -11,11 +11,15 @@ namespace Ewide.Core
         SysUser User { get; }
         string UserId { get; }
 
-        Task<SysUser> CheckUserAsync();
         Task<SysUser> CheckUserAsync(string userId);
-        Task<SysEmp> GetUserEmpInfo();
+        Task<SysUser> CheckUserAsync();
         Task<SysEmp> GetUserEmpInfo(string userId);
-        Task<List<string>> GetUserRoleIdList();
+        Task<SysEmp> GetUserEmpInfo();
+        Task<SysOrg> GetUserOrgInfo(string userId);
+        Task<SysOrg> GetUserOrgInfo();
         Task<List<string>> GetUserRoleIdList(string userId);
+        Task<List<string>> GetUserRoleIdList();
+        Task<List<SysRole>> GetUserRoleList(string userId);
+        Task<List<SysRole>> GetUserRoleList();
     }
 }
\ No newline at end of file
diff --git a/Api/Ewide.Core/Manager/UserManager.cs b/Api/Ewide.Core/Manager/UserManager.cs
index ee92244..6512364 100644
--- a/Api/Ewide.Core/Manager/UserManager.cs
+++ b/Api/Ewide.Core/Manager/UserManager.cs
@@ -18,6 +18,7 @@ namespace Ewide.Core
         private readonly IRepository<SysRole> _sysRoleRep;
         private readonly IRepository<SysUserRole> _sysUserRoleRep;
         private readonly IRepository<SysEmp> _sysEmpRep;   // 员工表
+        private readonly IRepository<SysOrg> _sysOrgRep;
         private readonly IHttpContextAccessor _httpContextAccessor;
 
         public string UserId
@@ -50,12 +51,14 @@ namespace Ewide.Core
             IRepository<SysRole> sysRoleRep,
             IRepository<SysUserRole> sysUserRoleRep,
             IRepository<SysEmp> sysEmpRep,
+            IRepository<SysOrg> sysOrgRep,
             IHttpContextAccessor httpContextAccessor)
         {
             _sysUserRep = sysUserRep;
             _sysRoleRep = sysRoleRep;
             _sysUserRoleRep = sysUserRoleRep;
             _sysEmpRep = sysEmpRep;
+            _sysOrgRep = sysOrgRep;
             _httpContextAccessor = httpContextAccessor;
         }
 
@@ -63,7 +66,6 @@ namespace Ewide.Core
         /// 获取用户信息
         /// </summary>
         /// <param name="userId"></param>
-        /// <param name="tracking"></param>
         /// <returns></returns>
         public async Task<SysUser> CheckUserAsync(string userId)
         {
@@ -71,6 +73,10 @@ namespace Ewide.Core
             return user ?? throw Oops.Oh(ErrorCode.D1002);
         }
 
+        /// <summary>
+        /// 获取用户信息
+        /// </summary>
+        /// <returns></returns>
         public async Task<SysUser> CheckUserAsync()
         {
             return await CheckUserAsync(UserId);
@@ -87,20 +93,75 @@ namespace Ewide.Core
             return emp ?? throw Oops.Oh(ErrorCode.D1002);
         }
 
+        /// <summary>
+        /// 获取用户员工信息
+        /// </summary>
+        /// <returns></returns>
         public async Task<SysEmp> GetUserEmpInfo()
         {
             return await GetUserEmpInfo(UserId);
         }
 
+        /// <summary>
+        /// 获取用户部门信息
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<SysOrg> GetUserOrgInfo(string userId)
+        {
+            var emp = await GetUserEmpInfo(userId);
+            var org = await _sysOrgRep.FirstOrDefaultAsync(u => u.Id == emp.OrgId, false);
+            return org ?? throw Oops.Oh(ErrorCode.D1002);
+        }
+
+        /// <summary>
+        /// 获取用户部门信息
+        /// </summary>
+        /// <returns></returns>
+        public async Task<SysOrg> GetUserOrgInfo()
+        {
+            return await GetUserOrgInfo(UserId);
+        }
+
+        /// <summary>
+        /// 获取用户角色Id列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
         public async Task<List<string>> GetUserRoleIdList(string userId)
         {
             var roleIds = await _sysUserRoleRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.SysRoleId).ToListAsync();
             return roleIds;
         }
 
+        /// <summary>
+        /// 获取用户角色Id列表
+        /// </summary>
+        /// <returns></returns>
         public async Task<List<string>> GetUserRoleIdList()
         {
             return await GetUserRoleIdList(UserId);
         }
+
+        /// <summary>
+        /// 获取用户角色列表
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public async Task<List<SysRole>> GetUserRoleList(string userId)
+        {
+            var roleIds = await GetUserRoleIdList(userId);
+            var roles = await _sysRoleRep.DetachedEntities.Where(u => roleIds.Contains(u.Id)).ToListAsync();
+            return roles;
+        }
+
+        /// <summary>
+        /// 获取用户角色列表
+        /// </summary>
+        /// <returns></returns>
+        public async Task<List<SysRole>> GetUserRoleList()
+        {
+            return await GetUserRoleList(UserId);
+        }
     }
 }
\ No newline at end of file