From 4aaeb28912a421caf93cf840fd81c1bd85823c0f Mon Sep 17 00:00:00 2001 From: yubaolee Date: Tue, 12 Dec 2017 17:19:46 +0800 Subject: [PATCH] ru --- OpenAuth.App/AuthoriseService.cs | 16 ++-- OpenAuth.App/Define.cs | 14 ++++ OpenAuth.App/OpenAuth.App.csproj | 1 + OpenAuth.App/OrgManagerApp.cs | 6 +- OpenAuth.App/RevelanceManagerApp.cs | 4 +- OpenAuth.App/UserManagerApp.cs | 78 +++++++------------ .../Controllers/ModuleManagerController.cs | 2 +- 7 files changed, 56 insertions(+), 65 deletions(-) create mode 100644 OpenAuth.App/Define.cs diff --git a/OpenAuth.App/AuthoriseService.cs b/OpenAuth.App/AuthoriseService.cs index 1364e052..ed4e80d1 100644 --- a/OpenAuth.App/AuthoriseService.cs +++ b/OpenAuth.App/AuthoriseService.cs @@ -80,8 +80,8 @@ namespace OpenAuth.App { var orgids = UnitWork.Find( u => - (u.FirstId == _user.Id && u.Key == "UserOrg") || - (u.Key == "RoleOrg" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); + (u.FirstId == _user.Id && u.Key == Define.USERORG) || + (u.Key == Define.ROLEORG && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); return UnitWork.Find(u => orgids.Contains(u.Id)); } @@ -93,8 +93,8 @@ namespace OpenAuth.App { var resourceIds = UnitWork.Find( u => - (u.FirstId == _user.Id && u.Key == "UserResource") || - (u.Key == "RoleResource" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); + (u.FirstId == _user.Id && u.Key == Define.USERRESOURCE) || + (u.Key == Define.ROLERESOURCE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); return UnitWork.Find(u => resourceIds.Contains(u.Id)); } @@ -105,8 +105,8 @@ namespace OpenAuth.App { var elementIds = UnitWork.Find( u => - (u.FirstId == _user.Id && u.Key == "UserElement") || - (u.Key == "RoleElement" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); + (u.FirstId == _user.Id && u.Key == Define.ROLERESOURCE) || + (u.Key == Define.ROLEELEMENT && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); return UnitWork.Find(u => elementIds.Contains(u.Id)); } @@ -117,8 +117,8 @@ namespace OpenAuth.App { var moduleIds = UnitWork.Find( u => - (u.FirstId == _user.Id && u.Key == "UserModule") || - (u.Key == "RoleModule" && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); + (u.FirstId == _user.Id && u.Key == Define.USERMODULE) || + (u.Key == Define.ROLEMODULE && _userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId); return UnitWork.Find(u => moduleIds.Contains(u.Id)).OrderBy(u => u.SortNo); } diff --git a/OpenAuth.App/Define.cs b/OpenAuth.App/Define.cs new file mode 100644 index 00000000..999de89c --- /dev/null +++ b/OpenAuth.App/Define.cs @@ -0,0 +1,14 @@ +namespace OpenAuth.App +{ + public static class Define + { + public const string ROLERESOURCE= "RoleResource"; //角色资源关联KEY + public const string USERRESOURCE = "UserResource"; //用户资源关联KEY + public const string USERORG = "UserOrg"; //用户机构关联KEY + public const string ROLEORG = "RoleOrg"; //角色机构关联KEY + public const string USERELEMENT = "UserElement"; //用户菜单关联KEY + public const string ROLEELEMENT = "RoleElement"; //角色菜单关联KEY + public const string USERMODULE = "UserModule"; //用户模块关联KEY + public const string ROLEMODULE = "RoleModule"; //角色模块关联KEY + } +} diff --git a/OpenAuth.App/OpenAuth.App.csproj b/OpenAuth.App/OpenAuth.App.csproj index 97acaa56..233d8374 100644 --- a/OpenAuth.App/OpenAuth.App.csproj +++ b/OpenAuth.App/OpenAuth.App.csproj @@ -106,6 +106,7 @@ + diff --git a/OpenAuth.App/OrgManagerApp.cs b/OpenAuth.App/OrgManagerApp.cs index 956a7880..4b3cabef 100644 --- a/OpenAuth.App/OrgManagerApp.cs +++ b/OpenAuth.App/OrgManagerApp.cs @@ -74,8 +74,8 @@ namespace OpenAuth.App var moduleIds = UnitWork.Find( u => - (u.FirstId == userId && u.Key == "UserOrg") || - (u.Key == "RoleOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList(); + (u.FirstId == userId && u.Key == Define.USERORG) || + (u.Key == Define.ROLEORG && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList(); if (!moduleIds.Any()) return new List(); return UnitWork.Find(u => moduleIds.Contains(u.Id)).ToList(); @@ -88,7 +88,7 @@ namespace OpenAuth.App public List LoadForRole(string roleId) { var moduleIds = - UnitWork.Find(u => u.FirstId == roleId && u.Key == "RoleOrg") + UnitWork.Find(u => u.FirstId == roleId && u.Key == Define.ROLEORG) .Select(u => u.SecondId) .ToList(); if (!moduleIds.Any()) return new List(); diff --git a/OpenAuth.App/RevelanceManagerApp.cs b/OpenAuth.App/RevelanceManagerApp.cs index c6da4c2f..ebbcef8b 100644 --- a/OpenAuth.App/RevelanceManagerApp.cs +++ b/OpenAuth.App/RevelanceManagerApp.cs @@ -12,7 +12,7 @@ namespace OpenAuth.App /// 添加关联 /// 比如给用户分配资源，那么firstId就是用户ID，secIds就是资源ID列表 /// - /// 关联的类型，如"UserResource" + /// 关联的类型，如Define.USERRESOURCE public void Assign(string type, string firstId, string[] secIds) { Assign(type, secIds.ToLookup(u => firstId)); @@ -54,7 +54,7 @@ namespace OpenAuth.App /// /// 取消关联 /// - /// 关联的类型，如"UserResource" + /// 关联的类型，如Define.USERRESOURCE /// The first identifier. /// The sec ids. public void UnAssign(string type, string firstId, string[] secIds) diff --git a/OpenAuth.App/UserManagerApp.cs b/OpenAuth.App/UserManagerApp.cs index e34c6fd4..cd78a658 100644 --- a/OpenAuth.App/UserManagerApp.cs +++ b/OpenAuth.App/UserManagerApp.cs @@ -3,47 +3,50 @@ using System.Collections.Generic; using System.Linq; using OpenAuth.App.Request; using OpenAuth.App.Response; +using OpenAuth.App.SSO; using OpenAuth.Repository.Domain; namespace OpenAuth.App { - public class UserManagerApp :BaseApp + public class UserManagerApp : BaseApp { public RevelanceManagerApp ReleManagerApp { get; set; } - public User Get(string account) + public User Get(string account) { return Repository.FindSingle(u => u.Account == account); } /// - /// 加载一个部门及子部门全部用户 + /// 加载当前登录用户可访问的一个部门及子部门全部用户 /// public TableData Load(QueryUserListReq request) { - IEnumerable users; - int records = 0; - if (string.IsNullOrEmpty(request.orgId)) + var loginUser = AuthUtil.GetCurrentUser(); + + string cascadeId = ".0."; + if (!string.IsNullOrEmpty(request.orgId)) { - users = Repository.Find(null).OrderBy(u => u.Id).Skip((request.page - 1) * request.limit).Take(request.limit); - records = Repository.GetCount(); - } - else - { - var ids = GetSubOrgIds(request.orgId); - List userIds = ReleManagerApp.Get("UserOrg", false, ids); - users = UnitWork.Find(u =>userIds.Contains(u.Id)) - .OrderBy(u => u.Name) - .Skip((request.page - 1) * request.limit) - .Take(request.limit); - records = Repository.GetCount(u => userIds.Contains(u.Id)); + var org = loginUser.Orgs.SingleOrDefault(u => u.Id == request.orgId); + cascadeId = org.CascadeId; } + var ids = loginUser.Orgs.Where(u => u.CascadeId.Contains(cascadeId)).Select(u => u.Id).ToArray(); + var userIds = ReleManagerApp.Get(Define.USERORG, false, ids); + + var users = UnitWork.Find(u => userIds.Contains(u.Id)) + .OrderBy(u => u.Name) + .Skip((request.page - 1) * request.limit) + .Take(request.limit); + + var records = Repository.GetCount(u => userIds.Contains(u.Id)); + + var userviews = new List(); foreach (var user in users) { - UserView uv = user; + UserView uv = user; var orgs = LoadByUser(user.Id); uv.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList()); uv.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList()); @@ -57,33 +60,6 @@ namespace OpenAuth.App }; } - /// - /// 获取当前组织的所有下级组织 - /// - private string[] GetSubOrgIds(string orgId) - { - var org = UnitWork.FindSingle(u => u.Id == orgId); - var orgs = UnitWork.Find(u => u.CascadeId.Contains(org.CascadeId)) - .Select(u => u.Id).ToArray(); - return orgs; - } - - public UserView Find(string id) - { - var user = Repository.FindSingle(u => u.Id == id); - if (user == null) return new UserView(); - - UserView view = user; - foreach (var org in LoadByUser(id)) - { - view.Organizations += "," + org.Name; - view.OrganizationIds += "," + org.Id; - } - view.OrganizationIds = view.OrganizationIds.TrimStart(','); - view.Organizations = view.Organizations.TrimStart(','); - return view; - } - public void AddOrUpdate(UserView view) { if (string.IsNullOrEmpty(view.OrganizationIds)) @@ -113,8 +89,8 @@ namespace OpenAuth.App } string[] orgIds = view.OrganizationIds.Split(',').ToArray(); - ReleManagerApp.DeleteBy("UserOrg", user.Id); - ReleManagerApp.AddRelevance("UserOrg", orgIds.ToLookup(u => user.Id)); + ReleManagerApp.DeleteBy(Define.USERORG, user.Id); + ReleManagerApp.AddRelevance(Define.USERORG, orgIds.ToLookup(u => user.Id)); } /// @@ -123,9 +99,9 @@ namespace OpenAuth.App public IEnumerable LoadByUser(string userId) { var result = from userorg in UnitWork.Find(null) - join org in UnitWork.Find(null) on userorg.SecondId equals org.Id - where userorg.FirstId == userId && userorg.Key == "UserOrg" - select org; + join org in UnitWork.Find(null) on userorg.SecondId equals org.Id + where userorg.FirstId == userId && userorg.Key == Define.USERORG + select org; return result; } diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs index 64f70276..822b248b 100644 --- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs +++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs @@ -30,7 +30,7 @@ namespace OpenAuth.Mvc.Controllers var moduleWithChildren = AuthUtil.GetCurrentUser().Modules .GenerateTree(u =>u.Id, u =>u.ParentId); - var modules = key == "UserModule" ? App.LoadForUser(firstId) : App.LoadForRole(firstId); + var modules = key == Define.USERMODULE ? App.LoadForUser(firstId) : App.LoadForRole(firstId); CheckModule(moduleWithChildren, modules);