更改PDM文件

删除为用户分配可见机构（本身有机构功能）
删除为角色分配机构（本身有机构多对多功能）

OpenAuth.App/OpenAuth.App.csproj

@@ -37,6 +37,10 @@
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

OpenAuth.App/OrgManagerApp.cs

@@ -90,8 +90,8 @@ namespace OpenAuth.App
             var moduleIds =
                 _relevanceRepository.Find(
                     u =>
-                        (u.FirstId == userId && u.Key == "UserAccessedOrg") ||
-                        (u.Key == "RoleAccessedOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
+                        (u.FirstId == userId && u.Key == "UserOrg") ||
+                        (u.Key == "RoleOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
 
             if (!moduleIds.Any()) return new List<Org>();
             return _repository.Find(u => moduleIds.Contains(u.Id)).ToList();
@@ -104,7 +104,7 @@ namespace OpenAuth.App
         public List<Org> LoadForRole(Guid roleId)
         {
             var moduleIds =
-                _relevanceRepository.Find(u => u.FirstId == roleId && u.Key == "RoleAccessedOrg")
+                _relevanceRepository.Find(u => u.FirstId == roleId && u.Key == "RoleOrg")
                     .Select(u => u.SecondId)
                     .ToList();
             if (!moduleIds.Any()) return new List<Org>();

OpenAuth.App/RoleManagerApp.cs

@@ -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;

OpenAuth.App/ViewModel/RoleVM.cs

@@ -32,18 +32,25 @@ namespace OpenAuth.App.ViewModel
         /// <returns></returns>
         public string Name { get; set; }
 
+        /// <summary>
+        /// 当前状态
+        /// </summary>
+        public int Status { get; set; }
+        /// <summary>
+	    /// 角色类型
+	    /// </summary>
+        public int Type { get; set; }
+
 
         /// <summary>
-        /// 所属部门节点语义ID
+        /// 所属组织名称，多个可用，分隔
         /// </summary>
-        /// <returns></returns>
-        public string OrgCascadeId { get; set; }
+        public string Organizations { get; set; }
 
         /// <summary>
-        /// 所属部门名称
+        /// 所属组织ID，多个可用，分隔
         /// </summary>
-        /// <returns></returns>
-        public string OrgName { get; set; }
+        public string OrganizationIds { get; set; }
 
         /// <summary>
         ///是否属于某用户 

OpenAuth.App/packages.config

@@ -4,4 +4,5 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
 </packages>