lsm/OpenAuth.Net
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/OpenAuth.Net.git synced 2025-11-09 19:04:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

更改PDM文件

Browse Source 
删除为用户分配可见机构（本身有机构功能）
删除为角色分配机构（本身有机构多对多功能）
This commit is contained in:
yubaolee
2016-09-04 23:34:16 +08:00
parent d5a6ffe3b8
commit 56d5ea0e8a
26 changed files with 1293 additions and 1721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
OpenAuth.App/RoleManagerApp.cs
View File

@@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Dynamic;
using System.Linq;
using Newtonsoft.Json.Linq;
namespace OpenAuth.App
{
@@ -38,7 +39,7 @@ namespace OpenAuth.App
/// <summary>
/// 加载一个部门及子部门全部Roles
/// </summary>
public dynamic Load(Guid orgId, int pageindex, int pagesize)
public GridData Load(Guid orgId, int pageindex, int pagesize)
{
if (pageindex < 1) pageindex = 1; //TODO:如果列表为空新增加一个用户后，前端会传一个0过来，奇怪？？
IEnumerable<Role> roles;
@@ -54,12 +55,24 @@ namespace OpenAuth.App
total = _repository.GetRoleCntInOrgs(orgId);
}
dynamic result = new ExpandoObject();
result.total = total;
result.list = roles.ToList();
result.pageCurrent = pageindex;
var rolevms = new List<RoleVM>();
foreach (var role in roles)
{
RoleVM rolevm = role;
var orgs = _orgRepository.LoadByRole(role.Id);
rolevm.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
rolevm.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
rolevms.Add(rolevm);
}
return result;
var result = new GridData
{
total = total,
list = rolevms.ToList(),
pageCurrent = pageindex
};
return result;
}
/// <summary>
@@ -84,8 +97,9 @@ namespace OpenAuth.App
_repository.Delete(id);
}
public void AddOrUpdate(Role role)
public void AddOrUpdate(JObject obj)
{
var role = obj.ToObject<Role>();
if (role.Id == Guid.Empty)
{
role.CreateTime = DateTime.Now;
@@ -95,13 +109,21 @@ namespace OpenAuth.App
{
_repository.Update(role);
}
Guid[] orgIds = obj["OrganizationIds"].ToString().Split(',').Select(id => Guid.Parse(id)).ToArray();
_relevanceRepository.DeleteBy("RoleOrg", role.Id);
_relevanceRepository.AddRelevance("RoleOrg", orgIds.ToLookup(u => role.Id));
}
public List<RoleVM> LoadForOrgAndUser(Guid orgId, Guid userId)
{
var allorgs = GetSubOrgIds(orgId);
var roles = _relevanceRepository.Find(u => u.Key == "RoleOrg"
&& allorgs.Contains(u.SecondId)).Select(u =>u.FirstId).ToList(); //机构关联的角色
var roleIds = _repository.Find(u => orgId == Guid.Empty
|| (u.OrgId != null &&allorgs.Contains(u.OrgId.Value))).ToList();
|| (roles.Contains(u.Id))).ToList(); //从角色表里获取
var rolevms = new List<RoleVM>();
foreach (var role in roleIds)
{
@@ -110,6 +132,9 @@ namespace OpenAuth.App
&& u.FirstId == userId
&& u.Key == "UserRole")
!= null);
var orgs = _orgRepository.LoadByRole(role.Id);
rolevm.Organizations = string.Join(",", orgs.Select(u => u.Name).ToList());
rolevm.OrganizationIds = string.Join(",", orgs.Select(u => u.Id).ToList());
rolevms.Add(rolevm);
}
return rolevms;