From 579abefcb0ba9394ee6767a47ac7e65e7b5bc706 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Wed, 8 Aug 2018 20:29:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E9=80=89=E6=8B=A9=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/project/system/dept/controller/DeptController.java | 2 +- src/main/resources/templates/system/dept/add.html | 3 +-- src/main/resources/templates/system/dept/edit.html | 3 +-- src/main/resources/templates/system/dept/tree.html | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java b/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java index 9a4a4d41..83c1cad8 100644 --- a/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java +++ b/src/main/java/com/ruoyi/project/system/dept/controller/DeptController.java @@ -134,7 +134,7 @@ public class DeptController extends BaseController @GetMapping("/selectDeptTree/{deptId}") public String selectDeptTree(@PathVariable("deptId") Long deptId, ModelMap mmap) { - mmap.put("treeName", deptService.selectDeptById(deptId).getDeptName()); + mmap.put("dept", deptService.selectDeptById(deptId)); return prefix + "/tree"; } diff --git a/src/main/resources/templates/system/dept/add.html b/src/main/resources/templates/system/dept/add.html index f27f3c62..9536d9da 100644 --- a/src/main/resources/templates/system/dept/add.html +++ b/src/main/resources/templates/system/dept/add.html @@ -100,8 +100,7 @@ /*部门管理-新增-选择父部门树*/ function selectDeptTree() { - var treeId = $("#treeId").val(); - var deptId = treeId == null || treeId == "" ? "100" : treeId; + var deptId = $("#treeId").val(); var url = prefix + "/selectDeptTree/" + deptId; $.modal.open("选择部门", url, '380', '380'); } diff --git a/src/main/resources/templates/system/dept/edit.html b/src/main/resources/templates/system/dept/edit.html index 8bf2790c..1d2437b5 100644 --- a/src/main/resources/templates/system/dept/edit.html +++ b/src/main/resources/templates/system/dept/edit.html @@ -103,8 +103,7 @@ /*部门管理-修改-选择部门树*/ function selectDeptTree() { - var treeId = $("#treeId").val(); - var deptId = treeId == null || treeId == "" ? "100" : treeId; + var deptId = $("#treeId").val(); var url = prefix + "/selectDeptTree/" + deptId; $.modal.open("选择部门", url, '380', '380'); } diff --git a/src/main/resources/templates/system/dept/tree.html b/src/main/resources/templates/system/dept/tree.html index ba5c21a8..86067dd4 100644 --- a/src/main/resources/templates/system/dept/tree.html +++ b/src/main/resources/templates/system/dept/tree.html @@ -8,8 +8,8 @@ body{height:auto;font-family: "Microsoft YaHei";} button{font-family: "SimSun","Helvetica Neue",Helvetica,Arial;} - - + +