diff --git a/OpenAuth.Mvc/Controllers/BaseController.cs b/OpenAuth.Mvc/Controllers/BaseController.cs
index a654d147..14baed08 100644
--- a/OpenAuth.Mvc/Controllers/BaseController.cs
+++ b/OpenAuth.Mvc/Controllers/BaseController.cs
@@ -21,6 +21,9 @@ namespace OpenAuth.Mvc.Controllers
 {
 	public class BaseController : Controller
 	{
+        protected BjuiResponse BjuiResponse = new BjuiResponse();
+
+       
 		protected override void OnActionExecuting(ActionExecutingContext filterContext)
 		{
 			base.OnActionExecuting(filterContext);
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index 542e9a4a..9db477fb 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -10,7 +10,7 @@ namespace OpenAuth.Mvc.Controllers
     public class OrgManagerController : BaseController
     {
         private OrgManagerApp _orgApp;
-        private BjuiResponse _bjuiResponse = new BjuiResponse();
+       
 
         public OrgManagerController()
         {
@@ -48,10 +48,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                _bjuiResponse.statusCode = "300";
-                _bjuiResponse.message = ex.Message;
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(_bjuiResponse);
+            return JsonHelper.Instance.Serialize(BjuiResponse);
         }
 
         public string EditOrg(string json)
@@ -63,10 +63,10 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception ex)
             {
-                _bjuiResponse.statusCode = "300";
-                _bjuiResponse.message = ex.Message;
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = ex.Message;
             }
-            return JsonHelper.Instance.Serialize(_bjuiResponse);
+            return JsonHelper.Instance.Serialize(BjuiResponse);
         }
 
         public string LoadOrg()
@@ -95,11 +95,11 @@ namespace OpenAuth.Mvc.Controllers
             }
             catch (Exception e)
             {
-                _bjuiResponse.statusCode = "300";
-                _bjuiResponse.message = e.Message;
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = e.Message;
             }
 
-            return JsonHelper.Instance.Serialize(_bjuiResponse);
+            return JsonHelper.Instance.Serialize(BjuiResponse);
         }
     }
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Controllers/UserManagerController.cs b/OpenAuth.Mvc/Controllers/UserManagerController.cs
index 9e07099b..9acdc0b1 100644
--- a/OpenAuth.Mvc/Controllers/UserManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/UserManagerController.cs
@@ -6,7 +6,7 @@ using System.Web.Mvc;
 
 namespace OpenAuth.Mvc.Controllers
 {
-    public class UserManagerController : Controller
+    public class UserManagerController : BaseController
     {
         //
         // GET: /UserManager/
diff --git a/OpenAuth.Mvc/OpenAuth.Mvc.csproj b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
index 814e1877..bac3e456 100644
--- a/OpenAuth.Mvc/OpenAuth.Mvc.csproj
+++ b/OpenAuth.Mvc/OpenAuth.Mvc.csproj
@@ -563,7 +563,6 @@
   <ItemGroup>
     <Folder Include="App_Data\" />
     <Folder Include="Views\Base\" />
-    <Folder Include="Views\UserManager\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
@@ -614,6 +613,9 @@
   <ItemGroup>
     <None Include="Views\OrgManager\AddOrg.cshtml" />
     <None Include="Views\OrgManager\LookupParent.cshtml" />
+    <Content Include="Views\UserManager\Index.cshtml" />
+    <Content Include="Views\UserManager\AddOrg.cshtml" />
+    <Content Include="Views\OrgManager\LookupOrg.cshtml" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/OpenAuth.Mvc/Views/Home/Index.cshtml b/OpenAuth.Mvc/Views/Home/Index.cshtml
index d62ac8fb..e812426f 100644
--- a/OpenAuth.Mvc/Views/Home/Index.cshtml
+++ b/OpenAuth.Mvc/Views/Home/Index.cshtml
@@ -203,8 +203,9 @@
                             <div class="items hide" data-noinit="true">
                                 <ul id="bjui-doc-tree-base" class="ztree ztree_main" data-toggle="ztree" data-on-click="MainMenuClick"
                                     data-expand-all="true" data-faicon="star-o" data-tit="基本设置">
-                                    <li data-id="99" data-pid="0" data-faicon="folder-open-o" data-faicon-close="folder-o">文件列表</li>
-                                    <li data-id="100" data-pid="99" data-url="OrgManager/Index" data-tabid="doc-file" data-faicon="caret-right">机构管理</li>
+                                    <li data-id="99" data-pid="0" data-faicon="folder-open-o" data-faicon-close="folder-o">系统设置</li>
+                                    <li data-id="100" data-pid="99" data-url="OrgManager/Index" data-tabid="orgManager" data-faicon="caret-right">机构管理</li>
+                                    <li data-id="101" data-pid="99" data-url="UserManager/Index" data-tabid="userManager" data-faicon="caret-right">用户管理</li>
                                 </ul>
                             </div>
                         </li>
diff --git a/OpenAuth.Mvc/Views/OrgManager/LookupOrg.cshtml b/OpenAuth.Mvc/Views/OrgManager/LookupOrg.cshtml
new file mode 100644
index 00000000..4a1f0171
--- /dev/null
+++ b/OpenAuth.Mvc/Views/OrgManager/LookupOrg.cshtml
@@ -0,0 +1,62 @@
+@model dynamic
+
+@{
+    ViewBag.Title = "title";
+    Layout = null;
+}
+<div class="bjui-pageContent">
+    <div style="float: left; width: 100%; height: 240px; overflow: auto;" class="table table-bordered">
+        <ul id="lookupTree" class="ztree"></ul>
+    </div>
+</div>
+<div class="bjui-pageFooter">
+    <ul>
+        <li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
+
+        <li>
+            <a href="javascript:;" id="btnSelected" data-toggle="lookupback"
+               data-args="{nationid:'A001', nation:'CN'}"
+               class="btn btn-blue" title="选择本项" data-icon="check">选择</a>
+        </li>
+       
+    </ul>
+</div>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        Init();
+    });
+    function Init() {
+        var setting = {
+            view: {
+                selectedMulti: false
+            },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: zTreeOnClick
+            }
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#lookupTree'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    function zTreeOnClick(event, treeId, treeNode) {
+        var selected = "{ParentName:'" + treeNode.Name + "', ParentId:" + treeNode.Id + "}";
+        $("#btnSelected").attr("data-args",selected);
+    }
+
+    //@@ sourceURL=lookupParent.js
+</script>
diff --git a/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml b/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml
index 705cca14..4a1f0171 100644
--- a/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/LookupParent.cshtml
@@ -11,12 +11,14 @@
 </div>
 <div class="bjui-pageFooter">
     <ul>
+        <li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
+
         <li>
             <a href="javascript:;" id="btnSelected" data-toggle="lookupback"
                data-args="{nationid:'A001', nation:'CN'}"
                class="btn btn-blue" title="选择本项" data-icon="check">选择</a>
         </li>
-        <li><button type="button" class="btn-close" data-icon="close">关闭</button></li>
+       
     </ul>
 </div>
 
diff --git a/OpenAuth.Mvc/Views/UserManager/AddOrg.cshtml b/OpenAuth.Mvc/Views/UserManager/AddOrg.cshtml
new file mode 100644
index 00000000..796a340f
--- /dev/null
+++ b/OpenAuth.Mvc/Views/UserManager/AddOrg.cshtml
@@ -0,0 +1,52 @@
+
+@{
+    ViewBag.Title = "title";
+    Layout = null;
+}
+
+<div class="bjui-pageContent">
+    <form action="/OrgManager/AddOrg" class="pageForm" data-toggle="validate">
+        <table class="table table-condensed table-hover">
+            <tbody>
+                <tr>
+                    <td align="center"><h3>* 添加</h3></td>
+                </tr>
+              
+                <tr>
+                    <td>
+                        <label for="Name" class="control-label x90">机构名称：</label>
+                        <input type="text" name="Name" id="Name" value=""
+                                data-rule="required" size="20">
+                    </td>
+                   
+                </tr>
+                <tr>
+                    <td>
+                        <input  id="ParentId" name="ParentId" type="hidden">
+                        <label for="ParentName" class="control-label x90">上级机构：</label>
+                        <input type="text" name="ParentName" id="ParentName"
+                               value="" data-toggle="lookup" data-url="/OrgManager/LookupParent">
+                    </td>
+                   
+                </tr>
+                <tr>
+                    <td>
+                        <label for="Status" class="control-label x85">设置状态：</label>
+
+                        <select name="Status" id="Status" data-toggle="selectpicker" data-rule="required">
+                            <option value="0">正常</option>
+                            <option value="1">禁用</option>
+                        </select>
+
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </form>
+</div>
+<div class="bjui-pageFooter">
+    <ul>
+        <li><button type="button" class="btn-close">关闭</button></li>
+        <li><button type="submit" class="btn-green">保存</button></li>
+    </ul>
+</div>
diff --git a/OpenAuth.Mvc/Views/UserManager/Index.cshtml b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
new file mode 100644
index 00000000..98a462fd
--- /dev/null
+++ b/OpenAuth.Mvc/Views/UserManager/Index.cshtml
@@ -0,0 +1,174 @@
+<div class="bjui-pageContent">
+    <div class="clearfix">
+        <div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
+            <ul id="orgTree" class="ztree"></ul>
+        </div>
+
+        <div id="ztree-detail" style="margin-left: 225px; width: auto;height: auto">
+            <table id="mainGrid" data-width="100%" data-height="100%" class="table table-bordered"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript">
+    var selectedId = 0;
+    $(document).ready(function () {
+        Init(0);
+    });
+    //加载数据到datagrid
+    function loadDataGrid(data) {
+        //b-jui的datagrid需要重新处理HTML
+        $('#ztree-detail').empty()
+            .append('<table id="mainGrid" data-width="100%" data-height="100%" class="table table-bordered"></table>');
+        $('#mainGrid').datagrid({
+            gridTitle: '机构列表显示',
+            showToolbar: true,
+            toolbarItem: 'refresh, |, del,edit',
+            toolbarCustom: '<a href="/OrgManager/AddOrg" class="btn btn-green" data-icon ="plus"  ' +
+                'data-toggle="dialog" data-id="dialog-mask" data-mask="true">添加</a>' ,
+            columns: [
+            {
+                name: 'Id',
+                label: 'Id',
+                attrs: { readonly: 'readonly' },
+                hide: true
+            },
+            {
+                name: 'ParentId',
+                label: '上级机构ID',
+                attrs: { readonly: 'readonly'},
+                hide: true
+            },
+              {
+                  name: 'CascadeId',
+                  label: '唯一标识',
+                  attrs: { readonly: 'readonly'}
+              },
+              {
+                  name: 'Name',
+                  label: '机构名称'
+              },
+              {
+                  name: 'ParentName',
+                  label: '上级机构',
+                  edit: false,
+                  attrs: { readonly: 'readonly' }
+              },
+            {
+                name: 'Status',
+                label: '状态',
+                type: 'select',
+                align: 'center',
+                items:[{'0':'正常'}, {'1':'禁用'}]
+            },
+              {
+                  name: 'CreateTime',
+                  label: '登记日期',
+                  type: 'date',
+                  pattern: 'yyyy-MM-dd HH:mm:ss'
+              }
+            ],
+            data: data,
+            delUrl: 'OrgManager/DelOrg',
+            delPK: "Id",
+            editUrl: 'OrgManager/EditOrg',
+            editMode: 'dialog',
+            fullGrid: true,
+            showLinenumber: true,
+            showCheckboxcol: true,
+            paging: false,
+            filterMult: false,
+            showTfoot: true,
+            delCallback: function (delResult) {
+                if (delResult.statusCode == "200")
+                    Init(selectedId);
+                else {
+                    $(this).alertmsg('warn', delResult.message);
+                }
+            },
+            editCallback: function (delResult) {
+                if (delResult.statusCode == "200")
+                    Init(selectedId);
+                else {
+                    $(this).alertmsg('warn', delResult.message);
+                }
+            }
+        });
+    }
+    function zTreeOnClick(event, treeId, treeNode) {
+        selectedId = treeNode.Id;
+        $.getJSON('OrgManager/LoadChildren', {
+            id: treeNode.Id
+        }, function (json) {
+            loadDataGrid(json);
+        });
+    }
+
+    function Init(selectedId) {
+        var setting = {
+            view: {
+                selectedMulti: false
+            },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: zTreeOnClick
+            }
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#orgTree'), setting, json);
+            zTreeObj.expandAll(true);
+
+            $.getJSON('OrgManager/LoadChildren', {
+                id: selectedId
+            }, function (data) {
+                loadDataGrid(data);
+            });
+
+            //TODO：设置ztree选中，不过没看到效果..
+            var selectedNod = zTreeObj.getNodesByParam('Id', selectedId, null);
+            zTreeObj.selectNode(selectedNod, false);
+
+        });
+    }
+
+    //获取勾选的值
+    //column:为从0开始的列标识
+    function getSelected(column) {
+        var selected = $('#mainGrid').data('selectedTrs');
+        if (selected == null || selected.length == 0) {
+            $(this).alertmsg('warn', '至少选择一个对象', {
+                displayMode: 'slide',
+                title: '重要提示'
+            });
+            return null;
+        }
+
+        var records = new Array();
+        selected.each(function () {
+            records[records.length] = this.children[column].innerText;
+        });
+
+        return records;
+    }
+
+
+
+    //自定义的编辑按钮
+    function editOrg() {
+        var selected = getSelected(2);
+        if (selected == null) return;
+
+    }
+    //@@ sourceURL=orgIndex.js
+</script>