From 4ef6bbc33a6159288f3cfd9d949a75c779ffc3e0 Mon Sep 17 00:00:00 2001
From: maliang <maliang@lymsh.com>
Date: Fri, 17 Mar 2017 17:16:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A1=B5=E9=9D=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/depart/depart_edit.html   | 32 ++++++++++++++++++++--
 .../webapp/WEB-INF/views/depart/depart_list.html   |  6 ----
 .../com/lyms/web/controller/BaseController.java    |  1 +
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
index 9c2f897..f51118f 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_edit.html
@@ -19,6 +19,15 @@
                 </div>
             </div>
             
+            <div class="form-group">
+                <label class="col-sm-3 control-label">上级部门:</label>
+                <div class="col-sm-8">
+                     <select class="form-control" name="parentId" id="parent">
+                     	<option value="0">--选择--</option>
+                     </select>
+                </div>
+            </div>
+            
             <!-- <div class="form-group">
                 <label class="col-sm-3 control-label">状态:</label>
                 <div class="col-sm-8">
@@ -68,15 +77,14 @@
 #extends("/common/base_list.html")
 <!-- <script src="${ctx}/static/js/area.js"></script> -->
 <script type="text/javascript">
+	
+	//
 	var model = "/sysOrganizations/list?_size=100000&_offset=0";
 	$.get(APP.PATH+model,function(data) {
-		//console.log(data);
 		if(data!==null) {
 			var orgs = data.rows;
-			//console.log(orgs);
 			for(var i=0;i<orgs.length;i++) {
 				var tag = "";
-				//console.log("$!depart.orgId")
 				if(orgs[i].id==="$!depart.orgId") {
 					tag = 'selected="selected"';
 				}
@@ -84,6 +92,24 @@
 			}
 		}
 	})
+	
+	model = "/sysDepartments/list?_size=100000&_offset=0";
+	$.get(APP.PATH+model,function(data) {
+		if(data!==null) {
+			var orgs = data.rows;
+			for(var i=0;i<orgs.length;i++) {
+				if(orgs[i].id==="$!depart.id"){
+					continue;
+				}
+				var tag = "";
+				console.log(orgs[i].id+"  ->" +"$!depart.parentId")
+				if(orgs[i].id==="$!depart.parentId") {
+					tag = 'selected="selected"';
+				}
+				$("#parent").append("<option "+tag+" value="+orgs[i].id+">"+orgs[i].name+"</option>");
+			}
+		}
+	})
 
 	//获取所有区县
 	/* get("",function(data){
diff --git a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
index c6c2746..9ffd6f5 100644
--- a/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
+++ b/center.manager/src/main/webapp/WEB-INF/views/depart/depart_list.html
@@ -71,12 +71,6 @@ var default_dataColumns = [{
 					    field: 'shortCode',
 					    title: '简码'
 					},{
-					    field: 'ifdel',
-					    title: '是否删除'
-					},{
-					    field: 'created',
-					    title: '创建时间'
-					},{
 					    field: 'created',
 					    title: '创建时间'
 					}];
diff --git a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
index 45ab821..3cd3c4d 100644
--- a/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
+++ b/core.sdk/src/main/java/com/lyms/web/controller/BaseController.java
@@ -118,6 +118,7 @@ public class BaseController {
 		}
 		if (request.getParameter("_offset") != null) {
 			int _offset = 0;
+
 			_offset = Integer.parseInt(request.getParameter("_offset"));
 			_index = _offset / _size + 1;
 		}
-- 
1.8.3.1