From f2e21d6317775775e7f076c7da66107a9a520599 Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Tue, 10 Jan 2023 09:11:45 +0800 Subject: [PATCH] 'commit' --- FengHuang/WebRoot/html/pages/dep/depList.html | 2 +- FengHuang/target/classes/Sql/organization.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e35c8d4..a8d238d 100644 --- a/FengHuang/target/classes/Sql/organization.sql +++ b/FengHuang/target/classes/Sql/organization.sql @@ -84,7 +84,7 @@ -- 组织机构部门树 #sql("getOrgTreeByBureauId") - select org_id,org_name,(case when bureau_id=org_id then '-1' else parent_id end) as parent_id,bureau_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=? and b_use=1 order by sort_id,update_ts #end