diff --git a/OpenAuth.App/AuthStrategies/AuthStrategyContext.cs b/OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
index 0a29d81f..262d3e8a 100644
--- a/OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
+++ b/OpenAuth.App/AuthStrategies/AuthStrategyContext.cs
@@ -59,7 +59,7 @@ namespace OpenAuth.App
             get { return _strategy.Resources; }
         }
 
-        public List<Org> Orgs
+        public List<SysOrg> Orgs
         {
             get { return _strategy.Orgs; }
         }
diff --git a/OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs b/OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
index 64475e38..07bde569 100644
--- a/OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
+++ b/OpenAuth.App/AuthStrategies/NormalAuthStrategy.cs
@@ -99,13 +99,13 @@ namespace OpenAuth.App
             }
         }
 
-        public List<Org> Orgs
+        public List<SysOrg> Orgs
         {
             get
             {
                 var orgids = UnitWork.Find<Relevance>(
                     u =>u.FirstId == _user.Id && u.Key == Define.USERORG).Select(u => u.SecondId);
-                return UnitWork.Find<Org>(u => orgids.Contains(u.Id)).ToList();
+                return UnitWork.Find<SysOrg>(u => orgids.Contains(u.Id)).ToList();
             }
         }
 
diff --git a/OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs b/OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
index e9bab0c5..a1bf61f8 100644
--- a/OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
+++ b/OpenAuth.App/AuthStrategies/SystemAuthStrategy.cs
@@ -78,9 +78,9 @@ namespace OpenAuth.App
             get { return UnitWork.Find<Resource>(null).ToList(); }
         }
 
-        public List<Org> Orgs
+        public List<SysOrg> Orgs
         {
-            get { return UnitWork.Find<Org>(null).ToList(); }
+            get { return UnitWork.Find<SysOrg>(null).ToList(); }
         }
 
         public User User
diff --git a/OpenAuth.App/Interface/IAuthStrategy.cs b/OpenAuth.App/Interface/IAuthStrategy.cs
index 74cc0cd9..1336943a 100644
--- a/OpenAuth.App/Interface/IAuthStrategy.cs
+++ b/OpenAuth.App/Interface/IAuthStrategy.cs
@@ -33,7 +33,7 @@ namespace OpenAuth.App
 
          List<Resource> Resources { get; }
 
-         List<Org> Orgs { get; }
+         List<SysOrg> Orgs { get; }
 
          User User
         {
diff --git a/OpenAuth.App/OrgManager/OrgManagerApp.cs b/OpenAuth.App/OrgManager/OrgManagerApp.cs
index 4b40bb1f..ecd782c1 100644
--- a/OpenAuth.App/OrgManager/OrgManagerApp.cs
+++ b/OpenAuth.App/OrgManager/OrgManagerApp.cs
@@ -10,27 +10,27 @@ using OpenAuth.Repository.Interface;
 
 namespace OpenAuth.App
 {
-    public class OrgManagerApp : BaseTreeApp<Org,OpenAuthDBContext>
+    public class OrgManagerApp : BaseTreeApp<SysOrg,OpenAuthDBContext>
     {
         private RevelanceManagerApp _revelanceApp;
         /// <summary>
         /// 添加部门
         /// </summary>
-        /// <param name="org">The org.</param>
+        /// <param name="sysOrg">The org.</param>
         /// <returns>System.Int32.</returns>
         /// <exception cref="System.Exception">未能找到该组织的父节点信息</exception>
-        public string Add(Org org)
+        public string Add(SysOrg sysOrg)
         {
             var loginContext = _auth.GetCurrentUser();
             if (loginContext == null)
             {
                 throw new CommonException("登录已过期", Define.INVALID_TOKEN);
             }
-            CaculateCascade(org);
+            CaculateCascade(sysOrg);
 
             UnitWork.ExecuteWithTransaction(() =>
             {
-                UnitWork.Add(org);
+                UnitWork.Add(sysOrg);
                 UnitWork.Save();
 
                 //如果当前账号不是SYSTEM，则直接分配
@@ -40,23 +40,23 @@ namespace OpenAuth.App
                     {
                         type = Define.USERORG,
                         firstId = loginContext.User.Id,
-                        secIds = new[] { org.Id }
+                        secIds = new[] { sysOrg.Id }
                     });
                 }
             });
 
-            return org.Id;
+            return sysOrg.Id;
         }
 
-        public string Update(Org org)
+        public string Update(SysOrg sysOrg)
         {
-            if (org.Id == org.ParentId)
+            if (sysOrg.Id == sysOrg.ParentId)
             {
                 throw new Exception("上级节点不能为自己");
             }
-            UpdateTreeObj(org);
+            UpdateTreeObj(sysOrg);
 
-            return org.Id;
+            return sysOrg.Id;
         }
         
         /// <summary>
@@ -64,15 +64,15 @@ namespace OpenAuth.App
         /// </summary>
         public void DelOrgCascade(string[] ids)
         {
-            var delOrgCascadeIds = UnitWork.Find<Org>(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
+            var delOrgCascadeIds = UnitWork.Find<SysOrg>(u => ids.Contains(u.Id)).Select(u => u.CascadeId).ToArray();
             var delOrgIds = new List<string>();
             foreach (var cascadeId in delOrgCascadeIds)
             {
-                delOrgIds.AddRange(UnitWork.Find<Org>(u=>u.CascadeId.Contains(cascadeId)).Select(u =>u.Id).ToArray());
+                delOrgIds.AddRange(UnitWork.Find<SysOrg>(u=>u.CascadeId.Contains(cascadeId)).Select(u =>u.Id).ToArray());
             }
             
             UnitWork.Delete<Relevance>(u =>u.Key == Define.USERORG && delOrgIds.Contains(u.SecondId));
-            UnitWork.Delete<Org>(u => delOrgIds.Contains(u.Id));
+            UnitWork.Delete<SysOrg>(u => delOrgIds.Contains(u.Id));
             UnitWork.Save();
             
         }
@@ -81,16 +81,16 @@ namespace OpenAuth.App
         /// 加载特定用户的部门
         /// </summary>
         /// <param name="userId">The user unique identifier.</param>
-        public List<Org> LoadForUser(string userId)
+        public List<SysOrg> LoadForUser(string userId)
         {
             var result = from userorg in UnitWork.Find<Relevance>(null)
-                join org in UnitWork.Find<Org>(null) on userorg.SecondId equals org.Id
+                join org in UnitWork.Find<SysOrg>(null) on userorg.SecondId equals org.Id
                 where userorg.FirstId == userId && userorg.Key == Define.USERORG
                 select org;
             return result.ToList();
         }
 
-        public OrgManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<Org,OpenAuthDBContext> repository,IAuth auth, 
+        public OrgManagerApp(IUnitWork<OpenAuthDBContext> unitWork, IRepository<SysOrg,OpenAuthDBContext> repository,IAuth auth, 
             RevelanceManagerApp revelanceApp) : base(unitWork, repository, auth)
         {
             _revelanceApp = revelanceApp;
diff --git a/OpenAuth.App/Test/TestOrgApp.cs b/OpenAuth.App/Test/TestOrgApp.cs
index be6206de..ef022bb2 100644
--- a/OpenAuth.App/Test/TestOrgApp.cs
+++ b/OpenAuth.App/Test/TestOrgApp.cs
@@ -35,7 +35,7 @@ namespace OpenAuth.App.Test
             Console.WriteLine(orgname);
             var app = _autofacServiceProvider.GetService<OrgManagerApp>();
 
-            var id = app.Add(new Org
+            var id = app.Add(new SysOrg
             {
                 Name = orgname,
                 ParentId = ""
@@ -63,7 +63,7 @@ namespace OpenAuth.App.Test
             Console.WriteLine(orgname);
             var app = _autofacServiceProvider.GetService<OrgManagerApp>();
 
-            var id = app.Update(new Org
+            var id = app.Update(new SysOrg
             {
                 Id="543a9fcf-4770-4fd9-865f-030e562be238",
                 Name = orgname,
diff --git a/OpenAuth.App/UserManager/UserManagerApp.cs b/OpenAuth.App/UserManager/UserManagerApp.cs
index 76711fd2..ad7673ca 100644
--- a/OpenAuth.App/UserManager/UserManagerApp.cs
+++ b/OpenAuth.App/UserManager/UserManagerApp.cs
@@ -51,7 +51,7 @@ namespace OpenAuth.App
                 join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
                     on user.Id equals relevance.FirstId into temp
                 from r in temp.DefaultIfEmpty()
-                join org in UnitWork.Find<Org>(null)
+                join org in UnitWork.Find<SysOrg>(null)
                     on r.SecondId equals org.Id into orgtmp
                 from o in orgtmp.DefaultIfEmpty()
                 select new
@@ -133,7 +133,7 @@ namespace OpenAuth.App
                join relevance in UnitWork.Find<Relevance>(u => u.Key == "UserOrg")
                    on user.Id equals relevance.FirstId into temp
                from r in temp.DefaultIfEmpty()
-               join org in UnitWork.Find<Org>(null)
+               join org in UnitWork.Find<SysOrg>(null)
                    on r.SecondId equals org.Id into orgtmp
                from o in orgtmp.DefaultIfEmpty()
                select new
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index 6ca7526e..6fb98be3 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -34,11 +34,11 @@ namespace OpenAuth.Mvc.Controllers
 
         //添加组织提交
         [HttpPost]
-        public string Add(Org org)
+        public string Add(SysOrg sysOrg)
         {
             try
             {
-                _orgApp.Add(org);
+                _orgApp.Add(sysOrg);
             }
             catch (Exception ex)
             {
@@ -50,11 +50,11 @@ namespace OpenAuth.Mvc.Controllers
 
         //编辑
         [HttpPost]
-        public string Update(Org org)
+        public string Update(SysOrg sysOrg)
         {
             try
             {
-                _orgApp.Update(org);
+                _orgApp.Update(sysOrg);
             }
             catch (Exception ex)
             {
diff --git a/OpenAuth.Mvc/Controllers/UserSessionController.cs b/OpenAuth.Mvc/Controllers/UserSessionController.cs
index 1e74dd01..aa67398d 100644
--- a/OpenAuth.Mvc/Controllers/UserSessionController.cs
+++ b/OpenAuth.Mvc/Controllers/UserSessionController.cs
@@ -118,7 +118,7 @@ namespace OpenAuth.Mvc.Controllers
         /// </summary>
         public string GetOrgs()
         {
-             var resp = new Response<List<Org>>();
+             var resp = new Response<List<SysOrg>>();
             try
             {
                 resp.Result = _authStrategyContext.Orgs;
diff --git a/OpenAuth.Repository/Domain/Org.cs b/OpenAuth.Repository/Domain/Org.cs
index 898200d8..a95e7175 100644
--- a/OpenAuth.Repository/Domain/Org.cs
+++ b/OpenAuth.Repository/Domain/Org.cs
@@ -18,9 +18,9 @@ namespace OpenAuth.Repository.Domain
 	/// 组织表
 	/// </summary>
       [Table("Org")]
-    public partial class Org : TreeEntity
+    public partial class SysOrg : TreeEntity
     {
-        public Org()
+        public SysOrg()
         {
           this.CascadeId= string.Empty;
           this.Name= string.Empty;
diff --git a/OpenAuth.Repository/OpenAuthDBContext.cs b/OpenAuth.Repository/OpenAuthDBContext.cs
index 0078df0e..be71bba3 100644
--- a/OpenAuth.Repository/OpenAuthDBContext.cs
+++ b/OpenAuth.Repository/OpenAuthDBContext.cs
@@ -90,7 +90,7 @@ namespace OpenAuth.Repository
         public virtual DbSet<Form> Forms { get; set; }
         public virtual DbSet<Module> Modules { get; set; }
         public virtual DbSet<ModuleElement> ModuleElements { get; set; }
-        public virtual DbSet<Org> Orgs { get; set; }
+        public virtual DbSet<SysOrg> Orgs { get; set; }
         public virtual DbSet<Relevance> Relevances { get; set; }
         public virtual DbSet<Resource> Resources { get; set; }
         public virtual DbSet<Role> Roles { get; set; }
diff --git a/OpenAuth.Repository/Test/TestTransaction.cs b/OpenAuth.Repository/Test/TestTransaction.cs
index 5a9688e6..a6db4d0a 100644
--- a/OpenAuth.Repository/Test/TestTransaction.cs
+++ b/OpenAuth.Repository/Test/TestTransaction.cs
@@ -116,7 +116,7 @@ namespace OpenAuth.Repository.Test
                     });
                     
 
-                    unitWork.Update<Org>(u => u.Id == "08f41bf6-4388-4b1e-bd3e-2ff538b44b1b", u => new Org
+                    unitWork.Update<SysOrg>(u => u.Id == "08f41bf6-4388-4b1e-bd3e-2ff538b44b1b", u => new SysOrg
                     {
                        CreateTime = DateTime.Now
                     });
diff --git a/OpenAuth.WebApi/Controllers/CheckController.cs b/OpenAuth.WebApi/Controllers/CheckController.cs
index 21198fb8..c643213a 100644
--- a/OpenAuth.WebApi/Controllers/CheckController.cs
+++ b/OpenAuth.WebApi/Controllers/CheckController.cs
@@ -146,9 +146,9 @@ namespace OpenAuth.WebApi.Controllers
         /// 获取登录用户的所有可访问的组织信息
         /// </summary>
         [HttpGet]
-        public Response<List<Org>> GetOrgs()
+        public Response<List<SysOrg>> GetOrgs()
         {
-            var result = new Response<List<Org>>();
+            var result = new Response<List<SysOrg>>();
             try
             {
                 result.Result = _authStrategyContext.Orgs;
diff --git a/OpenAuth.WebApi/Controllers/OrgsController.cs b/OpenAuth.WebApi/Controllers/OrgsController.cs
index 4e2d4980..fe587ae6 100644
--- a/OpenAuth.WebApi/Controllers/OrgsController.cs
+++ b/OpenAuth.WebApi/Controllers/OrgsController.cs
@@ -20,9 +20,9 @@ namespace OpenAuth.WebApi.Controllers
         /// 获取机构详情
         /// </summary>
         [HttpGet]
-        public Response<Org> Get(string id)
+        public Response<SysOrg> Get(string id)
         {
-            var result = new Response<Org>();
+            var result = new Response<SysOrg>();
             try
             {
                 result.Result = _app.Get(id);
@@ -43,9 +43,9 @@ namespace OpenAuth.WebApi.Controllers
         /// <param name="obj"></param>
         /// <returns></returns>
         [HttpPost]
-        public Response<Org> Add(Org obj)
+        public Response<SysOrg> Add(SysOrg obj)
         {
-            var result = new Response<Org>();
+            var result = new Response<SysOrg>();
             try
             {
                 _app.Add(obj);
@@ -62,7 +62,7 @@ namespace OpenAuth.WebApi.Controllers
 
         //添加或修改
         [HttpPost]
-        public Response Update(Org obj)
+        public Response Update(SysOrg obj)
         {
             var result = new Response();
             try