From 4af334f2ad7eeab801b8724f0bf420f4276e98ed Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 25 八月 2022 12:08:50 +0800 Subject: [PATCH] update 同步 ruoyi 新功能 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java | 26 -------------------------- 1 files changed, 0 insertions(+), 26 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index 2980e64..411eee9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -1,7 +1,6 @@ package com.ruoyi.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.ArrayUtil; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.constant.UserConstants; @@ -15,9 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.List; -import java.util.Map; /** * 閮ㄩ棬淇℃伅 @@ -66,29 +63,6 @@ public R<SysDept> getInfo(@PathVariable Long deptId) { deptService.checkDeptDataScope(deptId); return R.ok(deptService.selectDeptById(deptId)); - } - - /** - * 鑾峰彇閮ㄩ棬涓嬫媺鏍戝垪琛� - */ - @GetMapping("/treeselect") - public R<List<Tree<Long>>> treeselect(SysDept dept) { - List<SysDept> depts = deptService.selectDeptList(dept); - return R.ok(deptService.buildDeptTreeSelect(depts)); - } - - /** - * 鍔犺浇瀵瑰簲瑙掕壊閮ㄩ棬鍒楄〃鏍� - * - * @param roleId 瑙掕壊ID - */ - @GetMapping(value = "/roleDeptTreeselect/{roleId}") - public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) { - List<SysDept> depts = deptService.selectDeptList(new SysDept()); - Map<String, Object> ajax = new HashMap<>(); - ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId)); - ajax.put("depts", deptService.buildDeptTreeSelect(depts)); - return R.ok(ajax); } /** -- Gitblit v1.9.3