1.0 beta版

1 完成进出库实例Stock；
2 全面实现组织数据分离，参考Stock实例；
3 全新的基于CodeSmith EF生成机制；
4 全面完成菜单授权;
5 增加Anonymous机制，可以灵活控制Action是否需要权限控制;

OpenAuth.App/LoginApp.cs

@@ -80,7 +80,7 @@ namespace OpenAuth.App
             var orgids = _relevanceRepository.Find(
                     u =>
                         (u.FirstId == user.Id && u.Key == "UserAccessedOrg") ||
-                        (u.Key == "RoleAccessdOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
+                        (u.Key == "RoleAccessedOrg" && userRoleIds.Contains(u.FirstId))).Select(u => u.SecondId).ToList();
             loginVM.AccessedOrgs = _orgRepository.Find(u => orgids.Contains(u.Id)).ToList();
 
             return loginVM;
@@ -95,7 +95,8 @@ namespace OpenAuth.App
             {
                 User = new User
                 {
-                    Name = "开发者账号"
+                    Name = "开发者账号",
+                    Account = "System"
                 }
             };
             loginUser.Modules = _moduleRepository.Find(null).MapToList<ModuleView>();

OpenAuth.App/ModuleElementManagerApp.cs

@@ -98,14 +98,14 @@ namespace OpenAuth.App
 
         public void AssignForRole(int roleId,int moduleId, int[] menuIds)
         {
-            var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u =>u.Id);
+            var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u =>u.Id).ToArray();
             _relevanceRepository.Delete(u =>elements.Contains(u.SecondId) &&u.Key =="RoleElement" && u.FirstId == roleId);
             _relevanceRepository.AddRelevance("RoleElement", menuIds.ToLookup(u => roleId));
         }
 
         public void AssignForUser(int userId, int moduleId, int[] ids)
         {
-            var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u => u.Id);
+            var elements = _repository.Find(u => u.ModuleId == moduleId).Select(u => u.Id).ToArray();
             _relevanceRepository.Delete(u => elements.Contains(u.SecondId) && u.Key == "UserElement" && u.FirstId == userId);
             _relevanceRepository.AddRelevance("UserElement", ids.ToLookup(u => userId));
         }

OpenAuth.App/OrgManagerApp.cs

@@ -39,16 +39,7 @@ namespace OpenAuth.App
         /// </summary>
         public IList<Org> LoadAllChildren(int orgId)
         {
-            string cascadeId = "0.";
-            if (orgId != 0)
-            {
-                var org = _repository.FindSingle(u => u.Id == orgId);
-                if (org == null)
-                    throw new Exception("未能找到指定对象信息");
-                cascadeId = org.CascadeId;
-            }
-
-            return _repository.Find(u => u.CascadeId.Contains(cascadeId) && u.Id != orgId).ToList();
+            return _repository.GetSubOrgs(orgId).ToList();
         }
 
         /// <summary>

OpenAuth.App/StockManagerApp.cs

@@ -1,10 +1,11 @@
 
 using OpenAuth.Domain;
 using OpenAuth.Domain.Interface;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using Infrastructure;
+using Infrastructure.Helper;
+using OpenAuth.App.ViewModel;
 
 namespace OpenAuth.App
 {
@@ -20,39 +21,38 @@ namespace OpenAuth.App
             _orgRepository = orgRepository;
         }
 
-        public int GetStockCntInOrg(int orgId)
-        {
-            if (orgId == 0)
-            {
-                return _repository.Find(null).Count();
-            }
-            else
-            {
-                return _repository.GetStockCntInOrgs(GetSubOrgIds(orgId));
-            }
-        }
-        
-        public List<Stock> LoadAll()
-        {
-            return _repository.Find(null).ToList();
-        }
-
         /// <summary>
-        /// 加载一个节点下面的一个或全部Stocks
+        /// 根据部门ID得到进出库信息
         /// </summary>
         public dynamic Load(int orgId, int pageindex, int pagesize)
         {
             IEnumerable<Stock> Stocks;
-            int total = 0;
+            var user = SessionHelper.GetSessionUser<LoginUserVM>();
+            var loginOrgs = user.AccessedOrgs.Select(u => u.Id).ToArray();
+
+            int total;
             if (orgId == 0)
             {
-                Stocks = _repository.LoadStocks(pageindex, pagesize);
-                total = _repository.GetCount();
+               
+                if (loginOrgs.Length == 0)  //改用户没有任何可见机构
+                {
+                    Stocks = _repository.Find(pageindex, pagesize, "", u => u.User == user.User.Account);
+                    total = _repository.GetCount(u =>u.User ==user.User.Account);
+                }
+                else
+                {
+                    Stocks = _repository.LoadInOrgs(pageindex, pagesize, loginOrgs);
+                    total = _repository.GetStockCntInOrgs(loginOrgs);
+                }
+              
             }
-            else
+            else  //加载选择的机构及用户可访问的所有子机构
             {
-                Stocks = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId));
-                total = _repository.GetStockCntInOrgs(orgId);
+                var orgs = _orgRepository.GetSubOrgs(orgId).Where(u =>loginOrgs.Contains(u.Id));
+                List<int> orgIds = orgs.Select(u => u.Id).ToList();
+                orgIds.Add(orgId);
+                Stocks = _repository.LoadInOrgs(pageindex, pagesize, orgIds.ToArray());
+                total = _repository.GetStockCntInOrgs(orgIds.ToArray());
             }
 
             return new 
@@ -63,16 +63,6 @@ namespace OpenAuth.App
             };
         }
 
-        /// <summary>
-        /// 获取当前节点的所有下级节点
-        /// </summary>
-        private int[] GetSubOrgIds(int 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 Stock Find(int id)
         {
             var stock = _repository.FindSingle(u => u.Id == id);