全面修改Id为Guid类型，为2.0版做准备

OpenAuth.App/RoleManagerApp.cs

@@ -3,6 +3,7 @@ using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
 using System;
 using System.Collections.Generic;
+using System.Dynamic;
 using System.Linq;
 
 namespace OpenAuth.App
@@ -22,9 +23,9 @@ namespace OpenAuth.App
             _relevanceRepository = relevanceRepository;
         }
 
-        public int GetRoleCntInOrg(int orgId)
+        public int GetRoleCntInOrg(Guid orgId)
         {
-            if (orgId == 0)
+            if (orgId == Guid.Empty)
             {
                 return _repository.Find(null).Count();
             }
@@ -37,12 +38,12 @@ namespace OpenAuth.App
         /// <summary>
         /// 加载一个部门及子部门全部Roles
         /// </summary>
-        public dynamic Load(int orgId, int pageindex, int pagesize)
+        public dynamic Load(Guid orgId, int pageindex, int pagesize)
         {
             if (pageindex < 1) pageindex = 1; //TODO:如果列表为空新增加一个用户后，前端会传一个0过来，奇怪？？
             IEnumerable<Role> roles;
             int total = 0;
-            if (orgId == 0)
+            if (orgId == Guid.Empty)
             {
                 roles = _repository.LoadRoles(pageindex, pagesize);
                 total = _repository.GetCount();
@@ -53,39 +54,39 @@ namespace OpenAuth.App
                 total = _repository.GetRoleCntInOrgs(orgId);
             }
 
-            return new
-            {
-                total = total,
-                list = roles,
-                pageCurrent = pageindex
-            };
+            dynamic result = new ExpandoObject();
+            result.total = total;
+            result.list = roles.ToList();
+            result.pageCurrent = pageindex;
+
+           return result;
         }
 
         /// <summary>
         /// 获取当前组织的所有下级组织
         /// </summary>
-        private int[] GetSubOrgIds(int orgId)
+        private Guid[] GetSubOrgIds(Guid orgId)
         {
             var org = _orgRepository.FindSingle(u => u.Id == orgId);
             var orgs = _orgRepository.Find(u => u.CascadeId.Contains(org.CascadeId)).Select(u => u.Id).ToArray();
             return orgs;
         }
 
-        public Role Find(int id)
+        public Role Find(Guid id)
         {
             var role = _repository.FindSingle(u => u.Id == id);
             if (role == null) role = new Role();
             return role;
         }
 
-        public void Delete(int id)
+        public void Delete(Guid id)
         {
             _repository.Delete(id);
         }
 
         public void AddOrUpdate(Role role)
         {
-            if (role.Id == 0)
+            if (role.Id == Guid.Empty)
             {
                 role.CreateTime = DateTime.Now;
                 _repository.Add(role);
@@ -96,10 +97,11 @@ namespace OpenAuth.App
             }
         }
 
-        public List<RoleVM> LoadForOrgAndUser(int orgId, int userId)
+        public List<RoleVM> LoadForOrgAndUser(Guid orgId, Guid userId)
         {
             var allorgs = GetSubOrgIds(orgId);
-            var roleIds = _repository.Find(u => orgId == 0 || allorgs.Contains(u.OrgId)).ToList();
+            var roleIds = _repository.Find(u => orgId == Guid.Empty 
+            || (u.OrgId != null &&allorgs.Contains(u.OrgId.Value))).ToList();
             var rolevms = new List<RoleVM>();
             foreach (var role in roleIds)
             {
@@ -113,12 +115,12 @@ namespace OpenAuth.App
             return rolevms;
         }
 
-        public void AccessRole(int userId, int[] roleIds)
+        public void AccessRole(Guid userId, Guid[] roleIds)
         {
             _relevanceRepository.AddRelevance("UserRole", roleIds.ToLookup(roleId => userId));
         }
 
-        public void DelAccessRole(int userId, int[] roleids)
+        public void DelAccessRole(Guid userId, Guid[] roleids)
         {
             _relevanceRepository.DeleteBy("UserRole", roleids.ToLookup(roleId => userId));
         }