From 096f6025e0212b23df8485b56818c3f0b019aa26 Mon Sep 17 00:00:00 2001
From: yijiusmile <253281376@qq.com>
Date: 星期二, 20 四月 2021 10:40:31 +0800
Subject: [PATCH] 修复导入空行的问题
---
febs-server/febs-server-system/src/main/java/cc/mrbird/febs/server/system/controller/DeptController.java | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 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 71a2c6d..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
@@ -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,6 +34,10 @@
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) {
@@ -71,8 +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());
+ return userRightDepts;
+ }
}
--
Gitblit v1.8.0