From bb3139e62038f3c165253cf5724325092966be78 Mon Sep 17 00:00:00 2001
From: 孔 <1124498879@qq.com>
Date: 星期三, 23 六月 2021 14:26:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
index f68de3f..48a9cc9 100644
--- a/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
+++ b/febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java
@@ -79,15 +79,14 @@
ExcelKit.$Export(Dept.class, response).downXlsx(depts, false);
}
- @GetMapping("redis")
- public void setDeptToRedis(){
- deptService.setDeptRedis();
+ @GetMapping("setDeptToRedis")
+ public List<Dept> setDeptToRedis(){
+ return deptService.setDeptRedis();
}
- @GetMapping("userRightDepts")
- public String userRightDepts(){
- String userRightDepts=userDataPermissionService.findByUserId(FebsUtil.getUserId());
- log.info("当前用户权限"+userRightDepts);
- return userRightDepts;
- }
+ @GetMapping("userRightDepts")
+ public String userRightDepts() {
+ String userRightDepts = userDataPermissionService.findByUserId(FebsUtil.getUserId());
+ return userRightDepts;
+ }
}
--
Gitblit v1.8.0