From 813b80aeea6829d082d6461da33894a99f07edba Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 18 May 2021 14:47:49 +0800
Subject: [PATCH] 1.新增根据用户编号查询用户信息接口 2.修复考勤导出信息中考勤类型缺失bug
---
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java | 46 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
index 8af5cde..db0fd4e 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
@@ -20,6 +20,7 @@
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.*;
import lombok.AllArgsConstructor;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.log.annotation.ApiLog;
@@ -118,6 +119,30 @@
}
/**
+ * 获取部门树形结构
+ *
+ * @return
+ */
+ @GetMapping("/trees")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> trees(String tenantId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.trees();
+ return R.data(tree);
+ }
+
+ /**
+ * 获取处警员树形结构
+ */
+ @GetMapping("/Batrees")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "树形结构", notes = "树形结构")
+ public R<List<DeptVO>> Batrees(String tenantId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.Batrees();
+ return R.data(tree);
+ }
+
+ /**
* 懒加载获取部门树形结构
*/
@GetMapping("/lazy-tree")
@@ -127,6 +152,18 @@
List<DeptVO> tree = deptService.lazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
return R.data(tree);
}
+
+ /**
+ * 懒加载获取部门树形结构
+ */
+ @GetMapping("/lazy-trees")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+ public R<List<DeptVO>> lazyTrees(String tenantId, Long parentId, BladeUser bladeUser) {
+ List<DeptVO> tree = deptService.lazyTrees(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+ return R.data(tree);
+ }
+
/**
* 新增或修改
@@ -161,4 +198,13 @@
public R selectInfo() {
return R.data(deptService.selectInfo());
}
+
+ /**
+ * 查询所有的部门信息
+ * @return
+ */
+ @GetMapping("/selDeptList")
+ public List<DeptVo> selDeptList() {
+ return deptService.selDeptList();
+ }
}
--
Gitblit v1.9.3