From fb9823428a7705d8ed8e2f4128e525df3781e968 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期二, 03 八月 2021 10:21:09 +0800
Subject: [PATCH] fix(bug修复): 导入的新员工增加了入离职记录；重新处理了导入的日期格式
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FolderController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FolderController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FolderController.java
index 3f098aa..89cc324 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FolderController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/FolderController.java
@@ -1,5 +1,6 @@
package cc.mrbird.febs.server.hr.controller;
+import cc.mrbird.febs.common.core.entity.system.Dept;
import cc.mrbird.febs.server.hr.entity.Folder;
import cc.mrbird.febs.server.hr.service.IFolderService;
import cc.mrbird.febs.common.core.entity.FebsResponse;
@@ -35,7 +36,11 @@
public FebsResponse getAllFolders(Folder folder) {
return new FebsResponse().data(folderService.findFolders(folder));
}
-
+ @GetMapping("treeList")
+ public FebsResponse folderTreeList(QueryRequest request, Folder folder) {
+ Map<String, Object> depts = this.folderService.folderTreeList(request, folder);
+ return new FebsResponse().data(depts);
+ }
@GetMapping("list")
@PreAuthorize("hasAuthority('folder:list')")
public FebsResponse folderList(QueryRequest request, Folder folder) {
--
Gitblit v1.8.0