From 104866d83bcf2a73fcc49752e6efe6ecc2df2e26 Mon Sep 17 00:00:00 2001
From: yubaolee <yubaolee@163.com>
Date: Thu, 29 Oct 2015 23:51:10 +0800
Subject: [PATCH] Routine Update

---
 OpenAuth.App/OrgManagerApp.cs                 |  16 +++
 .../Controllers/OrgManagerController.cs       |  16 +--
 OpenAuth.Mvc/Views/OrgManager/Index.cshtml    | 103 +++++++++---------
 OpenAuth.Repository/App.config                |   7 ++
 4 files changed, 83 insertions(+), 59 deletions(-)
 create mode 100644 OpenAuth.Repository/App.config

diff --git a/OpenAuth.App/OrgManagerApp.cs b/OpenAuth.App/OrgManagerApp.cs
index eb6dd67b..45a24137 100644
--- a/OpenAuth.App/OrgManagerApp.cs
+++ b/OpenAuth.App/OrgManagerApp.cs
@@ -21,6 +21,12 @@ namespace OpenAuth.App
             return _repository.LoadOrgs();
         }
 
+        /// <summary>
+        /// 添加部门
+        /// </summary>
+        /// <param name="org">The org.</param>
+        /// <returns>System.Int32.</returns>
+        /// <exception cref="System.Exception">未能找到该组织的父节点信息</exception>
         public int AddOrg(Org org)
         {
             string cascadeId;
@@ -61,5 +67,15 @@ namespace OpenAuth.App
             _repository.Save();
             return org.Id;
         }
+
+        /// <summary>
+        /// 部门的直接子部门
+        /// </summary>
+        /// <param name="orgId">The org unique identifier.</param>
+        /// <returns>IEnumerable{Org}.</returns>
+        public IEnumerable<Org> LoadChildren(int orgId)
+        {
+            return _repository.Find(u => u.ParentId == orgId);
+        }
     }
 }
diff --git a/OpenAuth.Mvc/Controllers/OrgManagerController.cs b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
index 8d097171..6a12e3f1 100644
--- a/OpenAuth.Mvc/Controllers/OrgManagerController.cs
+++ b/OpenAuth.Mvc/Controllers/OrgManagerController.cs
@@ -5,6 +5,7 @@ using System.Web;
 using System.Web.Mvc;
 using Infrastructure;
 using OpenAuth.App;
+using OpenAuth.Domain;
 
 namespace OpenAuth.Mvc.Controllers
 {
@@ -26,19 +27,14 @@ namespace OpenAuth.Mvc.Controllers
 
 		public string LoadOrg()
 		{
-			var orgs = _orgApp.GetAll();
-			return JsonHelper.Instance.Serialize(orgs);
+		    return JsonHelper.Instance.Serialize(_orgApp.GetAll());
 		}
 
-	    public JsonResult LoadTree()
+	    public string LoadChildren(int id)
 	    {
-	        return Json(_orgApp.GetAll().Select(o =>new
-	        {
-               id = o.Id,
-               pId = o.ParentId,
-               name = o.Name,
-               text = o.Name
-	        }), JsonRequestBehavior.AllowGet);
+	        return JsonHelper.Instance.Serialize(_orgApp.LoadChildren(id));
 	    }
+
+	   
 	}
 }
\ No newline at end of file
diff --git a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
index 9803ec92..ebb60a71 100644
--- a/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
+++ b/OpenAuth.Mvc/Views/OrgManager/Index.cshtml
@@ -11,10 +11,6 @@
 
 <script type="text/javascript">
 
-    function zTreeOnClick(event, treeId, treeNode) {
-        alert(treeNode.tId + ", " + treeNode.name);
-    };
-
     $(document).ready(function () {
 
         var setting = {
@@ -22,10 +18,14 @@
                 selectedMulti: false
             },
             data: {
+                key: {
+                    name: "Name",
+                    title: "Name"
+                },
                 simpleData: {
                     enable: true,
-                    idKey: "id",
-                    pIdKey: "pId",
+                    idKey: "Id",
+                    pIdKey: "ParentId",
                     rootPId: "null"
                 }
             },
@@ -34,53 +34,58 @@
             }
         };
 
-        $.getJSON("OrgManager/LoadTree", function (json) {
+        $.getJSON("OrgManager/LoadOrg", function (json) {
             var zTreeObj = $.fn.zTree.init($("#orgTree"), setting, json);
-        });
 
-        $('#test-datagrid-array').datagrid({
-            gridTitle: '机构列表显示',
-            showToolbar: true,
-            toolbarItem: 'all',
-            addLocation: 'first',
-            local: 'local',
-            dataUrl: 'OrgManager/LoadOrg',
-            dataType: 'json',
-            columns: [
-                {
-                    name: 'Type',
-                    label: '类型',
-                    type: 'select',
-                    items: [{ '0': '默认' }],
-                    align: 'center',
-                    width: 80,
-                    render: $.datagrid.renderItem
-                },
-                {
-                    name: 'Name',
-                    label: '机构名称',
-                    align: 'center',
-                    width: 100,
-                    rule: 'required'
-                },
-                {
-                    name: 'CreateTime',
-                    label: '登记日期',
-                    type: 'date',
-                    pattern: 'yyyy-MM-dd HH:mm'
-                }
-            ],
-            hiddenFields: ['Id'],
-            editUrl: 'ajaxDone1.html',
-            delUrl: 'ajaxDone1.html',
-            paging: { total: 30, pageSize: 5 },
-            showTfoot: true,
-            editMode: 'dialog',
-            fullGrid: true,
-            showLinenumber: true,
-            showCheckboxcol: true
+            $('#test-datagrid-array').datagrid({
+                gridTitle: '机构列表显示',
+                showToolbar: true,
+                toolbarItem: 'all',
+                columns: [
+                    { name: 'Name', width: '150', label: '机构名称' },
+                    { name: 'CreateTime', width: '120', label: '登记日期' }
+                ],
+                data: json,
+                hiddenFields: ['Id'],
+                editUrl: 'ajaxDone1.html',
+                delUrl: 'ajaxDone1.html',
+                editMode: 'dialog',
+                fullGrid: true,
+                showLinenumber: true,
+                showCheckboxcol: true,
+                paging: false,
+                filterMult: false,
+                showTfoot: true
+            });
         });
 
     });
+
+    function zTreeOnClick(event, treeId, treeNode) {
+        $.getJSON("OrgManager/LoadChildren", { id: treeNode.Id }, function (json) {
+            $('#test-datagrid-array').destroy();
+            $('#test-datagrid-array').datagrid({
+                gridTitle: '机构列表显示',
+                showToolbar: true,
+                toolbarItem: 'all',
+                columns: [
+                    { name: 'Name', width: '150', label: '机构名称' },
+                    { name: 'CreateTime', width: '120', label: '登记日期' }
+                ],
+                data: json,
+                hiddenFields: ['Id'],
+                editUrl: 'ajaxDone1.html',
+                delUrl: 'ajaxDone1.html',
+                editMode: 'dialog',
+                fullGrid: true,
+                showLinenumber: true,
+                showCheckboxcol: true,
+                paging: false,
+                filterMult: false,
+                showTfoot: true
+            });
+        });
+
+    }
     //@@ sourceURL=orgIndex.js
 </script>
\ No newline at end of file
diff --git a/OpenAuth.Repository/App.config b/OpenAuth.Repository/App.config
new file mode 100644
index 00000000..b1300dd5
--- /dev/null
+++ b/OpenAuth.Repository/App.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <connectionStrings>
+        <add name="OpenAuthDBContext" connectionString="Data Source=.;Initial Catalog=OpenAuthDB;Persist Security Info=True;User ID=sa;Password=000000;MultipleActiveResultSets=True"
+            providerName="System.Data.SqlClient" />
+    </connectionStrings>
+</configuration>
\ No newline at end of file