From 5e00fc89317ba366e162911b02c8bc9c0e7450d2 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期四, 04 三月 2021 13:41:38 +0800
Subject: [PATCH] fix(bug修复): 基本信息录入
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 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 4022870..f68de3f 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
@@ -4,8 +4,11 @@
import cc.mrbird.febs.common.core.entity.QueryRequest;
import cc.mrbird.febs.common.core.entity.constant.StringConstant;
import cc.mrbird.febs.common.core.entity.system.Dept;
+import cc.mrbird.febs.common.core.utils.FebsUtil;
import cc.mrbird.febs.server.system.annotation.ControllerEndpoint;
import cc.mrbird.febs.server.system.service.IDeptService;
+import cc.mrbird.febs.server.system.service.IUserDataPermissionService;
+
import com.wuwenze.poi.ExcelKit;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -18,6 +21,7 @@
import javax.validation.constraints.NotBlank;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
/**
* @author MrBird
@@ -30,7 +34,15 @@
public class DeptController {
private final IDeptService deptService;
+ private final IUserDataPermissionService userDataPermissionService;
+ private final String operatorId = Optional.ofNullable(FebsUtil.getCurrentUser())
+ .map(u -> u.getUserId().toString())
+ .orElse("1");
+ @GetMapping("all")
+ public FebsResponse getAllEmpBaseInfos(Dept dept) {
+ return new FebsResponse().data(deptService.findAllDepts(dept));
+ }
@GetMapping
public FebsResponse deptList(QueryRequest request, Dept dept) {
Map<String, Object> depts = this.deptService.findDepts(request, dept);
@@ -66,4 +78,16 @@
List<Dept> depts = this.deptService.findDepts(dept, request);
ExcelKit.$Export(Dept.class, response).downXlsx(depts, false);
}
+
+ @GetMapping("redis")
+ public void setDeptToRedis(){
+ deptService.setDeptRedis();
+ }
+
+ @GetMapping("userRightDepts")
+ public String userRightDepts(){
+ String userRightDepts=userDataPermissionService.findByUserId(FebsUtil.getUserId());
+ log.info("当前用户权限"+userRightDepts);
+ return userRightDepts;
+ }
}
--
Gitblit v1.8.0