diff --git a/Infrastructure/Infrastructure.csproj b/Infrastructure/Infrastructure.csproj
index 1ff7ab97..197466e9 100644
--- a/Infrastructure/Infrastructure.csproj
+++ b/Infrastructure/Infrastructure.csproj
@@ -62,6 +62,7 @@
     <Compile Include="LogHelper.cs" />
     <Compile Include="PredicateBuilder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Response.cs" />
     <Compile Include="SessionHelper.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Infrastructure/Response.cs b/Infrastructure/Response.cs
new file mode 100644
index 00000000..279d4139
--- /dev/null
+++ b/Infrastructure/Response.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Infrastructure
+{
+    public class Response
+    {
+        public bool Status = true;
+        public string Message = "操作成功";
+        public dynamic Result;
+    }
+}
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index ceabfa21..e509389b 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -12,6 +12,7 @@ namespace OpenAuth.Mvc.Controllers
 	public class OrgManagerController : BaseController
 	{
 		private OrgManagerApp _orgApp;
+        private Response _response = new Response();
 
 		public OrgManagerController()
 		{
@@ -35,14 +36,24 @@ namespace OpenAuth.Mvc.Controllers
 	        return JsonHelper.Instance.Serialize(_orgApp.LoadAllChildren(id));
 	    }
 
-        public void DelOrg(string json)
+        public string DelOrg(string json)
         {
-            var delObj = JsonHelper.Instance.Deserialize<Org[]>(json);
-            foreach (var obj in delObj)
+            try
             {
-                _orgApp.DelOrg(obj.Id);
+                var delObj = JsonHelper.Instance.Deserialize<Org[]>(json);
+                foreach (var obj in delObj)
+                {
+                    _orgApp.DelOrg(obj.Id);
+                }
             }
-           
+            catch (Exception e)
+            {
+                _response.Status = false;
+                _response.Message = e.Message;
+            }
+
+            return JsonHelper.Instance.Serialize(_response);
+
         }
 	}
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
index 2d070765..ae53ce81 100644
--- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
@@ -3,6 +3,8 @@
         <div style="float: left; width: 220px; height: 240px; overflow: auto;" class="table table-bordered">
             <ul id="orgTree" class="ztree"></ul>
         </div>
+
+        
         <div id="ztree-detail" style="margin-left: 225px; width: auto;">
             <table id="test-datagrid-array" data-width="100%" data-height="100%" class="table table-bordered"></table>
         </div>
@@ -10,70 +12,109 @@
 </div>
 
 <script type="text/javascript">
-
+    var selectedId = 0;
     $(document).ready(function () {
-
-        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);
-            loadDataGrid(json);
-        });
-
+        Init(0);
     });
-
+    //加载数据到datagrid
     function loadDataGrid(data) {
-
         $('#test-datagrid-array').datagrid({
             gridTitle: '机构列表显示',
             showToolbar: true,
-            toolbarItem: 'all',
+            toolbarItem: 'add, edit, refresh, |, del',
             columns: [
-                { name: 'Name', width: '150', label: '机构名称' },
-                { name: 'CreateTime', width: '120', label: '登记日期' }
+              {
+                  name: 'Id',
+                  hide: true
+              },
+              {
+                  name: 'Name',
+                  width: '150',
+                  label: '机构名称'
+              },
+              {
+                  name: 'CreateTime',
+                  width: '120',
+                  label: '登记日期'
+              }
             ],
             data: data,
-            hiddenFields: ['Id'],
-            editUrl: 'OrgManager/AddOrg',
+            addUrl: 'OrgManager/AddOrg',
             delUrl: 'OrgManager/DelOrg',
+            editUrl: 'OrgManager/EditOrg',
             editMode: 'dialog',
             fullGrid: true,
             showLinenumber: true,
             showCheckboxcol: true,
             paging: false,
             filterMult: false,
-            showTfoot: true
+            showTfoot: true,
+            delCallback: function (delResult) {
+                if (delResult.Status == true)
+                    Init(selectedId);
+                else {
+                    $(this).alertmsg('warn', delResult.Message);
+                }
+            }
         });
     }
-
     function zTreeOnClick(event, treeId, treeNode) {
-        $.getJSON("OrgManager/LoadChildren", { id: treeNode.Id }, function (json) {
-
+        selectedId = treeNode.Id;
+        $.getJSON('OrgManager/LoadChildren', {
+            id: treeNode.Id
+        }, function (json) {
             $('#ztree-detail').empty().append('<table id="test-datagrid-array" data-width="100%" data-height="100%" class="table table-bordered"></table>');
             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);
+            if (selectedId == 0) {
+                loadDataGrid(json);
+            } else {
+                //TODO：设置ztree选中，不过没看到效果..
+                var selectedNod = zTreeObj.getNodesByParam('Id', selectedId, null);
+                zTreeObj.selectNode(selectedNod, false);
+                $.getJSON('OrgManager/LoadChildren', {
+                    id: selectedId
+                }, function (data) {
+                    $('#ztree-detail').empty().append('<table id="test-datagrid-array" data-width="100%" data-height="100%" class="table table-bordered"></table>');
+                    loadDataGrid(data);
+                });
+            }
+        });
+    }
+    function getSelected() {
+        var selected = $('#test-datagrid-array').data('selectedTrs');
+        if (selected == null) {
+            $(this).alertmsg('warn', '至少选择一个对象', {
+                displayMode: 'slide',
+                title: '重要提示'
+            });
+        }
+        return selected;
     }
     //@@ sourceURL=orgIndex.js
 </script>
\ No newline at end of file