diff --git a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
index 1def878c..9715cadf 100644
--- a/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/ModuleManagerController.cs
@@ -54,6 +54,20 @@ namespace OpenAuth.Mvc.Controllers
         {
             var orgs = SessionHelper.GetSessionUser<LoginUserVM>().Modules;
             //添加根节点
+            //orgs.Add(new Module
+            //{
+            //    Id = 0,
+            //    ParentId = -1,
+            //    Name = "根节点",
+            //    CascadeId = "0"
+            //});
+            return JsonHelper.Instance.Serialize(orgs);
+        }
+
+        public string LoadModuleWithRoot()
+        {
+            var orgs = SessionHelper.GetSessionUser<LoginUserVM>().Modules.MapToList<ModuleView>();
+            //添加根节点
             orgs.Add(new Module
             {
                 Id = 0,
@@ -72,7 +86,7 @@ namespace OpenAuth.Mvc.Controllers
             {
                 Id = 0,
                 ParentId = -1,
-                Name = "用户可访问模块（包括角色所拥有的）",
+                Name = "用户及角色拥有的模块",
                 CascadeId = "0"
             });
             return JsonHelper.Instance.Serialize(orgs);
diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml
index 432407cc..a2199fcc 100644
--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@@ -148,7 +148,13 @@
             if (treeNode.target && treeNode.target == 'dialog')
                 $(event.target).dialog({ id: treeNode.tabid, url: treeNode.url, title: treeNode.name });
             else
-                $(event.target).navtab({ id: treeNode.tabid, url: treeNode.url, title: treeNode.name, fresh: treeNode.fresh, external: treeNode.external });
+                $(event.target).navtab({
+                    id: treeNode.tabid,
+                    url: treeNode.url,
+                    title: treeNode.name,
+                    fresh: treeNode.fresh,
+                    external: treeNode.external
+                });
         }
     </script>
 </head>
@@ -234,7 +240,9 @@
                         </li>
                     </ul>
                 </div>
-                <button type="button" class="btn-default bjui-hnav-more-right" title="导航菜单右移"><i class="fa fa-angle-double-right"></i></button>
+                <button type="button" class="btn-default bjui-hnav-more-right" title="导航菜单右移">
+                    <i class="fa fa-angle-double-right"></i>
+                </button>
             </div>
         </header>
         <div id="bjui-container">
@@ -249,10 +257,16 @@
                 </div>
             </div>
             <div id="bjui-navtab" class="tabsPage">
-                <div class="tabsPageHeader">
+                <div class="tabsPageHeader"><!--标签头-->
                     <div class="tabsPageHeaderContent">
                         <ul class="navtab-tab nav nav-tabs">
-                            <li data-url="Home/Main"><a href="javascript:;"><span><i class="fa fa-home"></i> #maintab#</span></a></li>
+                            <li data-url="Home/Main">
+                                <a href="javascript:;">
+                                    <span>
+                                        <i class="fa fa-home"></i> #maintab#
+                                    </span>
+                                </a>
+                            </li>
                         </ul>
                     </div>
                     <div class="tabsLeft"><i class="fa fa-angle-double-left"></i></div>
@@ -262,7 +276,7 @@
                 <ul class="tabsMoreList">
                     <li><a href="javascript:;">#maintab#</a></li>
                 </ul>
-                <div class="navtab-panel tabsPageContent">
+                <div class="navtab-panel tabsPageContent"> <!--标签内容-->
                     <div class="navtabPage unitBox">
                         <div class="bjui-pageContent" style="background:#FFF;">
                             Loading...
diff --git a/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml b/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml
index 4f7b2cc9..f8b8f562 100644
--- a/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml
+++ b/OpenAuth.Mvc/Views/Home/MenuHeader.cshtml
@@ -14,6 +14,7 @@
                     {
                         sb.Append("<" + element.Type
                                   + " data-icon='" + element.Icon + "' "
+                                  + " id='" + element.DomId + "' "
                                   + " class='" + element.Class + "' "
                                   + " onclick='" + element.Script + "' " + element.Attr
                                   + ">" + element.Name + "</" + element.Type + ">");
diff --git a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml
index f7ced0a4..a5adefbb 100644
--- a/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleElementManager/AssignForUser.cshtml
@@ -101,7 +101,7 @@
             },
             callback: { onClick: zTreeOnClick }
         };
-        $.getJSON('ModuleManager/LoadForTree', function (json) {
+        $.getJSON('ModuleManager/LoadForUser?userId=' + $('#userId').val(), function (json) {
             var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
             zTreeObj.expandAll(true);
         });
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
index 814903e8..ac71ae16 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Add.cshtml
@@ -125,7 +125,7 @@
                 onCheck: zTreeCheck
             }
         };
-        $.getJSON('ModuleManager/LoadForTree', function (json) {
+        $.getJSON('ModuleManager/LoadModuleWithRoot', function (json) {
             var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
             zTreeObj.expandAll(true);
         });
diff --git a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
index ad8a7c41..f7c12a6d 100644
--- a/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/ModuleManager/Index.cshtml
@@ -120,14 +120,14 @@
             },
             callback: {onClick: zTreeOnClick}
         };
-        $.getJSON('ModuleManager/LoadForTree', function (json) {
+        $.getJSON('ModuleManager/LoadModuleWithRoot', function (json) {
             var zTreeObj = $.fn.zTree.init($('#@_treeId'), setting, json);
             zTreeObj.expandAll(true);
         });
     }
 
     //删除
-    function del() {
+    function delModule() {
         var selected = getSelected('#@_gridId',2);
         if (selected == null) return;
         
@@ -150,7 +150,7 @@
             url: '/ModuleManager/Add?id=' + selected,
             title: '编辑',
             onClose:function() {
-                refreshGrid();
+                refreshModuleGrid();
             }
         });
 
@@ -172,7 +172,7 @@
 
     }
 
-    function refreshGrid() {
+    function refreshModuleGrid() {
         $('#@_gridId').datagrid('refresh');
        // loadDataGrid();
     }
diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
index ce1f53dd..2a9c9f7b 100644
--- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
@@ -125,18 +125,18 @@
         });
     }
 
-    function refreshGrid() {
+    function refreshOrgGrid() {
         $('#@_gridId').datagrid('refresh');
     }
 
     //删除
-    function del() {
+    function delOrg() {
         var selected = getSelected('#@_gridId',2);
         if (selected == null) return;
 
         $.getJSON('OrgManager/DelOrg?Id=' + selected, function (data) {
             if (data.statusCode == "200")
-                refreshGrid();
+                refreshOrgGrid();
             else {
                 $(this).alertmsg('warn', data.message);
             }
diff --git a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
index 52f99f56..a8c58d9e 100644
--- a/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/RoleManager/Index.cshtml
@@ -120,13 +120,13 @@
     }
 
     //删除
-    function del() {
+    function delRole() {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
         $.getJSON('RoleManager/Delete?Id=' + selected, function (data) {
             if (data.statusCode == "200")
-                refreshGrid();
+                refreshRoleGrid();
             else {
                 $(this).alertmsg('warn', data.message);
             }
@@ -143,18 +143,18 @@
             url: '/RoleManager/Add?id=' + selected,
             title: '编辑',
             onClose:function() {
-                refreshGrid();
+                refreshRoleGrid();
             }
         });
     }
 
-    function refreshGrid() {
+    function refreshRoleGrid() {
         $('#@_gridId').datagrid('refresh');
        // loadDataGrid();
     }
 
-    //角色模块授权按钮
-    function openModuleAccess(obj) {
+    //为角色分配模块
+    function assignRoleModule(obj) {
 
         var selected = getSelected('#@_gridId',2);
         if (selected == null) return;
@@ -170,7 +170,7 @@
     }
 
     //为角色分配菜单
-    function openAssignElement(obj) {
+    function assignRoleElement(obj) {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
index 52565d64..8ae3343a 100644
--- a/OpenAuth.Mvc/Views/UserManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -124,7 +124,7 @@
 
 
     //删除
-    function del() {
+    function delUser() {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
@@ -138,7 +138,7 @@
     }
 
     //自定义的编辑按钮
-    function editOrg() {
+    function editUser() {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
@@ -147,18 +147,18 @@
             url: '/UserManager/Add?id=' + selected,
             title: '编辑',
             onClose: function () {
-                refreshGrid();
+                refreshUserGrid();
             }
         });
 
     }
 
-    function refreshGrid() {
+    function refreshUserGrid() {
         $('#@_gridId').datagrid('refresh');
     }
 
     //用户模块授权按钮
-    function openModuleAccess(obj) {
+    function openUserModuleAccess(obj) {
 
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
@@ -174,7 +174,7 @@
     }
 
     //用户角色授权
-    function openRoleAccess(obj) {
+    function openUserRoleAccess(obj) {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
@@ -188,8 +188,8 @@
         });
     }
 
-    //为角色分配菜单
-    function openAssignElement(obj) {
+    //分配菜单
+    function openAssignUserElement(obj) {
         var selected = getSelected('#@_gridId', 2);
         if (selected == null) return;
 
diff --git a/单独初始化数据.sql b/单独初始化数据.sql
deleted file mode 100644
index 3807e8d5..00000000
Binary files a/单独初始化数据.sql and /dev/null differ
diff --git a/建表&初始化数据.sql b/建表&初始化数据.sql
index e5fddc2e..a1e827c7 100644
Binary files a/建表&初始化数据.sql and b/建表&初始化数据.sql differ