From 922a8345e2b7e2b52c629fffe81d6b5af91a81ec Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 二月 2023 11:06:52 +0800
Subject: [PATCH] update 优化 oss 增加创建人回显
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java
index 87d6ca2..7a0868f 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/system/SysRoleController.java
@@ -16,6 +16,7 @@
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.domain.bo.SysRoleBo;
+import com.ruoyi.system.domain.vo.DeptTreeSelectVo;
import com.ruoyi.system.domain.vo.SysRoleVo;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysRoleService;
@@ -27,7 +28,6 @@
import org.springframework.web.bind.annotation.*;
import java.util.List;
-import java.util.Map;
/**
* 瑙掕壊淇℃伅
@@ -228,10 +228,10 @@
*/
@SaCheckPermission("system:role:list")
@GetMapping(value = "/deptTree/{roleId}")
- public R<Map<String, Object>> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
- return R.ok(Map.of(
- "checkedKeys", deptService.selectDeptListByRoleId(roleId),
- "depts", deptService.selectDeptTreeList(new SysDept())
- ));
+ public R<DeptTreeSelectVo> roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
+ DeptTreeSelectVo selectVo = new DeptTreeSelectVo();
+ selectVo.setCheckedKeys(deptService.selectDeptListByRoleId(roleId));
+ selectVo.setDepts(deptService.selectDeptTreeList(new SysDept()));
+ return R.ok(selectVo);
}
}
--
Gitblit v1.9.3