diff --git a/CodeSmith/Add.cshtml.cst b/CodeSmith/Add.cshtml.cst
new file mode 100644
index 00000000..2cf8b971
--- /dev/null
+++ b/CodeSmith/Add.cshtml.cst
@@ -0,0 +1,148 @@
+<%-- 
+Name: Database Table Properties
+Author: Paul Welter
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" TargetLanguage="C#" Debug="False" Encoding="utf-8" Description="添加模块" %>
+<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context"
+Description="连接的数据库" %>
+<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
+<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %>
+<%@ Property Name="CascadeId" Type="String" Category="" Default="ParentId" Description="级联字段" %>
+<%@ Property Name="CascadeName" Type="String" Category="" Default="ParentName" Description="级联显示的文字" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+<script runat="template">
+public String GetModelName()
+{
+    if(NeedViewModel)
+        return ModuleName +"View";
+    else
+        return ModuleName;
+}
+</script>
+<%if(NeedViewModel){ %>
+@model OpenAuth.App.ViewModel.<%=GetModelName()%>
+<%} else{ %>
+@model OpenAuth.Domain.<%=GetModelName()%>
+<%} %>
+@{
+    ViewBag.Title = "<%=GetModelName()%>编辑界面";
+    Layout = null;
+}
+
+<div class="bjui-pageContent">
+    <form action="/<%=ModuleName%>Manager/Add" class="pageForm" data-toggle="validate">
+        <table class="table table-condensed table-hover">
+            <tbody>
+                <tr>
+                    <td align="center"><h3>* 添加</h3></td>
+                </tr>
+                  <% foreach (ColumnSchema column in this.SourceTable.Columns) {  
+                      if(column.Name == CascadeName) continue;
+                  %>
+                   <tr>
+                    <td>
+                        <%if(column.IsPrimaryKeyMember){ %>
+                        @Html.HiddenFor(m =>m.Id)
+                        <% }  else if(column.Name == CascadeId) {%>
+                                <label for="<%=column.Name%>" class="control-label x85"><%=column.Description%>：</label>
+                                <input id="<%=column.Name%>" name="<%=column.Name%>" value="" style="display: none"/>
+                                  <input type="text" name="<%=CascadeName%>" id="<%=CascadeName%>"
+                              data-toggle="selectztree" size="20" data-tree="#j_select_tree1" value="@Model.<%=CascadeName%>">
+                           <ul id="j_select_tree1" class="ztree hide" data-toggle="ztree"></ul>
+                      
+                        <% }  else if(CSharpAlias[column.SystemType.FullName] == "bool") {%>
+                                <label for="<%=column.Name%>" class="control-label x85"><%=column.Description%>：</label>
+
+                                <select name="<%=column.Name%>" id="<%=column.Name%>" data-toggle="selectpicker" data-rule="required">
+                                    <option value="0" @if (Model.<%=column.Name%>) { <text> selected="selected" </text>  }>否</option>
+                                    <option value="1" @if (!Model.<%=column.Name%>) { <text> selected="selected" </text>  }>是</option>
+                                </select>
+                       <%} else if(CSharpAlias[column.SystemType.FullName] == "int") {%>
+                                <label for="<%=column.Name%>" class="control-label x85"><%=column.Description%>：</label>
+                                <select name="<%=column.Name%>" id="<%=column.Name%>" data-toggle="selectpicker" data-rule="required">
+                                    <option value="0" @if (Model.<%=column.Name%> == 0) { <text> selected="selected" </text>  }>默认</option>
+                                    <option value="1" @if (Model.<%=column.Name%> == 1) { <text> selected="selected" </text>  }>状态1</option>
+                                </select>
+                       <%} else{%>  
+                        <label for="<%=column.Name%>" class="control-label x90"><%=column.Description%>：</label>
+                        <input type="text" name="<%=column.Name%>" id="<%=column.Name%>" value="@Model.<%=column.Name%>"
+                               data-rule="required" size="20">
+                       <%} %>
+                    </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>
+
+<script type="text/javascript">
+    $(document).ready(function () {
+        Init();
+    });
+    function Init() {
+        var setting = {
+            view: {
+                selectedMulti: false
+            },
+            check: {
+                enable: true,
+                chkStyle: "checkbox",
+                chkboxType: { "Y": "", "N": "" } //去掉勾选时级联
+            },
+            data: {
+                key: {
+                    name: 'Name',
+                    title: 'Name'
+                },
+                simpleData: {
+                    enable: true,
+                    idKey: 'Id',
+                    pIdKey: 'ParentId',
+                    rootPId: 'null'
+                }
+            },
+            callback: {
+                onClick: zTreeOnClick,
+                onCheck: zTreeCheck
+            }
+        };
+        $.getJSON('OrgManager/LoadOrg', function (json) {
+            var zTreeObj = $.fn.zTree.init($('#j_select_tree1'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    function zTreeCheck(e, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId),
+            nodes = zTree.getCheckedNodes(true);
+        var ids = '', names = '';
+        for (var i = 0; i < nodes.length; i++) {
+            ids += ',' + nodes[i].Id;
+            names += ',' + nodes[i].Name;
+        }
+        if (ids.length > 0) {  //去掉第一个逗号
+            ids = ids.substr(1);
+            names = names.substr(1);
+        }
+
+        var $from = $('#' + treeId).data('fromObj');
+        if ($from && $from.length) $from.val(names);
+
+        $('#<%=CascadeId%>').val(ids);
+    }
+    function zTreeOnClick(event, treeId, treeNode) {
+        var zTree = $.fn.zTree.getZTreeObj(treeId);
+        zTree.checkNode(treeNode, !treeNode.checked, true, true);
+        event.preventDefault();
+    }
+</script>
\ No newline at end of file
diff --git a/CodeSmith/Application.cst b/CodeSmith/Application.cst
new file mode 100644
index 00000000..7d3e6d7a
--- /dev/null
+++ b/CodeSmith/Application.cst
@@ -0,0 +1,131 @@
+<%-- 
+Name: Database Table Properties
+Author: Paul Welter
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="应用层" %>
+<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
+<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+<script runat="template">
+public String GetModelName()
+{
+    if(NeedViewModel)
+        return ModuleName +"View";
+    else
+        return ModuleName;
+}
+</script>
+
+<%if(NeedViewModel){ %>
+using OpenAuth.App.ViewModel;
+<%} %>
+using OpenAuth.Domain;
+using OpenAuth.Domain.Interface;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.App
+{
+    public class <%=ModuleName%>ManagerApp
+    {
+        private I<%=ModuleName%>Repository _repository;
+        private IOrgRepository _orgRepository;
+
+        public <%=ModuleName%>ManagerApp(I<%=ModuleName%>Repository repository,
+            IOrgRepository orgRepository)
+        {
+            _repository = repository;
+            _orgRepository = orgRepository;
+        }
+
+        public int Get<%=GetModelName()%>CntInOrg(int orgId)
+        {
+            if (orgId == 0)
+            {
+                return _repository.Find(null).Count();
+            }
+            else
+            {
+                return _repository.Get<%=GetModelName()%>CntInOrgs(GetSubOrgIds(orgId));
+            }
+        }
+
+        /// <summary>
+        /// 加载一个部门及子部门全部<%=GetModelName()%>s
+        /// </summary>
+        public dynamic Load(int orgId, int pageindex, int pagesize)
+        {
+            IEnumerable<<%=ModuleName%>> <%=ModuleName%>s;
+            int total = 0;
+            if (orgId == 0)
+            {
+                <%=ModuleName%>s = _repository.Load<%=ModuleName%>s(pageindex, pagesize);
+                total = _repository.GetCount();
+            }
+            else
+            {
+                <%=ModuleName%>s = _repository.LoadInOrgs(pageindex, pagesize,GetSubOrgIds(orgId));
+                total = _repository.Get<%=ModuleName%>CntInOrgs(orgId);
+            }
+            <%if(NeedViewModel){ %>
+            var <%=ModuleName%>views = new List<<%=ModuleName%>View>();
+            foreach (var <%=ModuleName%> in <%=ModuleName%>s)
+            {
+                <%=ModuleName%>View uv = <%=ModuleName%>;
+                uv.Organizations = string.Join(",", _orgRepository.LoadBy<%=ModuleName%>(<%=ModuleName%>.Id).Select(u => u.Name).ToList());
+                <%=ModuleName%>views.Add(uv);
+            }
+            <%} %>
+
+            return new 
+            {
+                total = total,
+                list = <%=GetModelName()%>s,
+                pageCurrent = pageindex
+            };
+        }
+
+        /// <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 <%=GetModelName()%> Find(int id)
+        {
+            var <%=ModuleName.ToLower()%> = _repository.FindSingle(u => u.Id == id);
+            if (<%=ModuleName.ToLower()%> == null) return new <%=GetModelName()%>();
+
+            return <%=ModuleName.ToLower() %>;
+        }
+
+        public void Delete(int id)
+        {
+            _repository.Delete(id);
+        }
+
+        public void AddOrUpdate(<%=GetModelName()%> model)
+        {
+            <%=ModuleName%> <%=ModuleName.ToLower()%> = model;
+            if (<%=ModuleName.ToLower()%>.Id == 0)
+            {
+                _repository.Add(<%=ModuleName.ToLower()%>);
+            }
+            else
+            {
+                _repository.Update(<%=ModuleName.ToLower()%>);
+            }
+           
+        }
+
+       
+    }
+}
\ No newline at end of file
diff --git a/CodeSmith/Controller.cst b/CodeSmith/Controller.cst
new file mode 100644
index 00000000..9b88dd88
--- /dev/null
+++ b/CodeSmith/Controller.cst
@@ -0,0 +1,102 @@
+<%-- 
+Name: Database Table Properties
+Author: Paul Welter
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="控制器" %>
+<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
+<%@ Property Name="NeedViewModel" Type="Boolean" Category="Context" Default="False" Description="是否需要ViewModel" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+<script runat="template">
+public String GetModelName()
+{
+    if(NeedViewModel)
+        return ModuleName +"View";
+    else
+        return ModuleName;
+}
+</script>
+
+using System;
+using System.Web.Mvc;
+using Infrastructure;
+using OpenAuth.App;
+<%if(NeedViewModel){ %>
+using OpenAuth.App.ViewModel;
+<%} %>
+
+namespace OpenAuth.Mvc.Controllers
+{
+    public class <%=ModuleName%>ManagerController : BaseController
+    {
+        private <%=ModuleName%>ManagerApp _app;
+
+        public <%=ModuleName%>ManagerController()
+        {
+            _app = (<%=ModuleName%>ManagerApp)DependencyResolver.Current.GetService(typeof(<%=ModuleName%>ManagerApp));
+        }
+
+        //
+        // GET: /<%=ModuleName%>Manager/
+        public ActionResult Index()
+        {
+            return View();
+        }
+
+        public ActionResult Add(int id = 0)
+        {
+            return View(_app.Find(id));
+        }
+
+        //添加或修改组织
+        [HttpPost]
+        public string Add(<%=GetModelName()%> model)
+        {
+            try
+            {
+                _app.AddOrUpdate(model);
+                
+            }
+            catch (Exception ex)
+            {
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = ex.Message;
+            }
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+
+        /// <summary>
+        /// 加载组织下面的所有用户
+        /// </summary>
+        public string Load(int orgId, int pageCurrent = 1, int pageSize = 30)
+        {
+            return JsonHelper.Instance.Serialize(_app.Load(orgId, pageCurrent, pageSize));
+        }
+
+        //获取组织下面用户个数
+        public int GetCount(int orgId)
+        {
+            return _app.Get<%=GetModelName()%>CntInOrg(orgId);
+        }
+
+        public string Delete(string Id)
+        {
+            try
+            {
+                foreach (var obj in Id.Split(','))
+                {
+                    _app.Delete(int.Parse(obj));
+                }
+            }
+            catch (Exception e)
+            {
+                BjuiResponse.statusCode = "300";
+                BjuiResponse.message = e.Message;
+            }
+
+            return JsonHelper.Instance.Serialize(BjuiResponse);
+        }
+    }
+}
\ No newline at end of file
diff --git a/CodeSmith/IRepository.cst b/CodeSmith/IRepository.cst
new file mode 100644
index 00000000..4e1ec96c
--- /dev/null
+++ b/CodeSmith/IRepository.cst
@@ -0,0 +1,28 @@
+<%-- 
+Name: Database Table Properties
+Author: Paul Welter
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="False" Description="创建包含组织机构的接口" %>
+<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OpenAuth.Domain.Interface
+{
+    public interface I<%=ModuleName%>Repository :IRepository<<%=ModuleName%>>
+    {
+        IEnumerable<<%=ModuleName%>> Load<%=ModuleName%>s(int pageindex, int pagesize);
+
+        IEnumerable<<%=ModuleName%>> LoadInOrgs(params int[] orgId);
+        int Get<%=ModuleName%>CntInOrgs(params int[] orgIds);
+        IEnumerable<<%=ModuleName%>> LoadInOrgs(int pageindex, int pagesize, params int[] orgIds);
+        
+        void Delete(int id);
+
+    }
+}
\ No newline at end of file
diff --git a/CodeSmith/Index.cshtml.cst b/CodeSmith/Index.cshtml.cst
new file mode 100644
index 00000000..5396b131
--- /dev/null
+++ b/CodeSmith/Index.cshtml.cst
@@ -0,0 +1,170 @@
+<%-- 
+Name: Database Table Properties
+Author: Paul Welter
+Description: Create a list of properties from a database table
+--%>
+<%@ CodeTemplate Language="C#" Encoding="utf-8" TargetLanguage="C#" Debug="True" Description="Create a list of properties from database table." %>
+<%@ Property Name="SourceTable" Type="SchemaExplorer.TableSchema" Category="Context" Description="Table that the object is based on." %>
+<%@ Property Name="ModuleName" Type="String" Category="Context" Description="模块名称" %>
+<%@ Map Name="CSharpAlias" Src="System-CSharpAlias" Description="System to C# Type Map" %>
+<%@ Assembly Name="SchemaExplorer" %>
+<%@ Import Namespace="SchemaExplorer" %>
+
+@{
+    string _prefix = "<%=ModuleName%>";
+    var _treeId = _prefix + "Tree";
+    var _gridId = _prefix + "Grid";
+    var _treeDetail = _prefix + "Detail";
+}
+<div class="bjui-pageContent">
+    <div class="clearfix">
+        <div style="float: left; width: 220px; overflow: auto;" class="table table-bordered">
+            <ul id="@_treeId" class="ztree"></ul>
+        </div>
+
+        <div id="@_treeDetail" style="margin-left: 225px;">
+        </div>
+    </div>
+</div>
+
+
+<script type="text/javascript">
+    var gridid = '#@_gridId';
+    var selectedId = 0;
+    $(document).ready(function () {
+        initZtree();
+        loadDataGrid();
+    });
+    //加载数据到datagrid
+    function loadDataGrid() {
+        //b-jui的datagrid需要重新处理HTML
+        $('#@_treeDetail').empty()
+            .append('<table id="@_gridId" class="table table-bordered"></table>');
+
+        $(gridid).datagrid({
+            gridTitle: '列表',
+            showToolbar: true,
+            filterThead: false,
+            toolbarItem: 'refresh, |, del',
+            toolbarCustom: '<a href="/<%=ModuleName%>Manager/Add" class="btn btn-green" data-icon ="plus"  ' +
+                'data-toggle="dialog" data-id="dialog-mask" data-mask="true" data-on-close="refreshGrid">添加</a>' +
+                '<button class=" btn-green" onclick="edit<%=ModuleName%>()" data-icon="pencil" type="button">编辑</button>',
+            columns: [
+            <% foreach (ColumnSchema column in this.SourceTable.Columns) {  %>
+               {
+                    name: '<%=column.Name%>',
+                    label: '<%=column.Description%>',
+                     width: 100
+                    <%if(column.IsPrimaryKeyMember){ %>
+                    , hide: true
+                    <%} %>
+                    <%else if(CSharpAlias[column.SystemType.FullName] == "System.DateTime") {%>
+                    , type: 'date',
+                    pattern: 'yyyy-MM-dd HH:mm:ss'
+                    <%} %>     
+                    <%else if(CSharpAlias[column.SystemType.FullName] == "bool") {%>
+                     ,type: 'select',
+                    align: 'center',
+                    items: [{ '0': '否' }, { '1': '是' }],
+                    <%} %>  
+                      <%else if(CSharpAlias[column.SystemType.FullName] == "int") {%>
+                     ,type: 'select',
+                    align: 'center',
+                    items: [{ '0': '默认' }, { '1': '状态1' }],
+                    <%} %>  
+               },    
+             <% } %>
+            ],
+            dataUrl: '<%=ModuleName%>Manager/Load?orgId=' + selectedId,
+            delUrl: '<%=ModuleName%>/Delete',
+            delPK: "Id",
+            fullGrid: true,
+            showLinenumber: true,
+            showCheckboxcol: true,
+            paging: true,
+            filterMult: false,
+            showTfoot: true,
+            height: '700',
+            delCallback: function (delResult) {
+                if (delResult.statusCode == "200")
+                    loadDataGrid();
+                else {
+                    $(this).alertmsg('warn', delResult.message);
+                }
+            }
+        });
+    }
+
+    function zTreeOnClick(event, treeId, treeNode) {
+        selectedId = treeNode.Id;
+        loadDataGrid();
+    }
+
+    function initZtree() {
+        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($('#@_treeId'), setting, json);
+            zTreeObj.expandAll(true);
+        });
+    }
+
+    //获取勾选的值
+    //column:为从0开始的列标识
+    function getSelected(column) {
+        var selected = $(gridid).data('selectedTrs');
+        if (selected == null || selected.length == 0) {
+            $(this).alertmsg('warn', '至少选择一个对象', {
+                displayMode: 'slide',
+                title: '重要提示'
+            });
+            return null;
+        }
+
+        //todo：下面这段只能chrome有效
+        var records = new Array();
+        selected.each(function () {
+            records[records.length] = this.children[column].innerText;
+        });
+
+        return records[0];
+    }
+
+
+
+    //自定义的编辑按钮
+    function edit<%=ModuleName%>() {
+        var selected = getSelected(2);
+        if (selected == null) return;
+
+        $(this).dialog({
+            id: 'editDialog',
+            url: '/<%=ModuleName%>Manager/Add?id=' + selected,
+            title: '编辑',
+            onClose:function() {
+                refreshGrid();
+            }
+        });
+
+    }
+
+    function refreshGrid() {
+        $('#@_gridId').datagrid('refresh');
+       // loadDataGrid();
+    }
+    //@@ sourceURL=<%=ModuleName%>ManagerIndex.js
+</script>
diff --git a/CodeSmith/proj/cshtml.csp b/CodeSmith/proj/cshtml.csp
new file mode 100644
index 00000000..50829c3d
--- /dev/null
+++ b/CodeSmith/proj/cshtml.csp
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<codeSmith xmlns="http://www.codesmithtools.com/schema/csp.xsd">
+  <variables>
+    <add key="ConnectionString1" value="Data Source=.;Initial Catalog=OpenAuthDB;Persist Security Info=True;User ID=sa;Password=000000;MultipleActiveResultSets=True" />
+  </variables>
+  <propertySets>
+    <propertySet name="Module.Index.cshtml" output="..\bin\ModuleManager\Index.cshtml" template="cshtmlwithorg.cst" mergeInit="Data Source=.;Initial Catalog=OpenAuthDB;Persist Security Info=True;User ID=sa;Password=000000;MultipleActiveResultSets=True">
+      <property name="SourceTable">
+        <connectionString>$(ConnectionString1)</connectionString>
+        <providerType>SchemaExplorer.SqlSchemaProvider,SchemaExplorer.SqlSchemaProvider</providerType>
+        <table>
+      <owner>dbo</owner>
+      <name>Module</name>
+    </table>
+      </property>
+      <property name="ModuleName">Module</property>
+    </propertySet>
+    <propertySet name="Role.Index.cshtml" output="..\bin\RoleManager\Index.cshtml" template="cshtmlwithorg.cst">
+      <property name="SourceTable">
+        <connectionString>$(ConnectionString1)</connectionString>
+        <providerType>SchemaExplorer.SqlSchemaProvider,SchemaExplorer.SqlSchemaProvider</providerType>
+        <table>
+      <owner>dbo</owner>
+      <name>Role</name>
+    </table>
+      </property>
+      <property name="ModuleName">Role</property>
+    </propertySet>
+  </propertySets>
+</codeSmith>
\ No newline at end of file