diff --git a/FengHuang/WebRoot/html/pages/dep/depList.html b/FengHuang/WebRoot/html/pages/dep/depList.html
index d86f2e2..4752662 100644
--- a/FengHuang/WebRoot/html/pages/dep/depList.html
+++ b/FengHuang/WebRoot/html/pages/dep/depList.html
@@ -135,7 +135,7 @@
             var btn = $("#addBtn_" + treeNode.tId);
             if (btn)
                 btn.bind("click", function () {
-                    WeAdminShow('添加', '../dep/add.html?org_id=' + treeNode.org_id, 550, 285);
+                    WeAdminShow('添加', '../dep/add.html?org_id=' + treeNode.org_id+'&parent_id='+treeNode.parent_id+'&org_type='+treeNode.department_type_id, 550, 285);
                 });
         }
 
diff --git a/FengHuang/target/classes/Sql/organization.sql b/FengHuang/target/classes/Sql/organization.sql
index 09c0c27..b653dd3 100644
--- a/FengHuang/target/classes/Sql/organization.sql
+++ b/FengHuang/target/classes/Sql/organization.sql
@@ -84,7 +84,11 @@
 
   -- 组织机构部门树
   #sql("getOrgTreeByBureauId")
+<<<<<<< HEAD
     select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,school_type_id,department_type_id from t_base_organization where bureau_id=?
+=======
+    select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_id,department_type_id from t_base_organization where bureau_id=?
+>>>>>>> 32b4533146dc66248f1e7fdf81fe41bff017b94c
       and b_use=1 order by sort_id,update_ts
   #end