From 748bd2dff7201eea3adaa1adbd459be4f0cc75d3 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 19 Jul 2021 11:38:28 +0800
Subject: [PATCH] 问题修复

---
 src/main/java/org/springblade/modules/system/controller/DeptController.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/controller/DeptController.java b/src/main/java/org/springblade/modules/system/controller/DeptController.java
index 7bbfa5d..2066d38 100644
--- a/src/main/java/org/springblade/modules/system/controller/DeptController.java
+++ b/src/main/java/org/springblade/modules/system/controller/DeptController.java
@@ -124,6 +124,27 @@
 		return R.data(tree);
 	}
 
+
+	/**
+	 * 懒加载获取部门树形结构(包含用户数据)
+	 * @return
+	 */
+	@GetMapping("/lazy-tree-user")
+	public R<List<DeptVO>> lazyTreeUser(String tenantId, Long parentId, BladeUser bladeUser) {
+		List<DeptVO> tree = deptService.lazyTreeUser(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+		return R.data(tree);
+	}
+
+	/**
+	 * 懒加载获取部门树形结构,不包含顶级管理员公安局
+	 */
+	@GetMapping("/security_lazy-tree")
+	@ApiOperation(value = "懒加载树形结构", notes = "树形结构")
+	public R<List<DeptVO>> securityLazyTree(String tenantId, Long parentId, BladeUser bladeUser) {
+		List<DeptVO> tree = deptService.securityLazyTree(Func.toStrWithEmpty(tenantId, bladeUser.getTenantId()), parentId);
+		return R.data(tree);
+	}
+
 	/**
 	 * 懒加载获取部门树形结构
 	 */
@@ -162,5 +183,8 @@
 		return R.status(deptService.removeDept(ids));
 	}
 
-
+	@GetMapping("/selectIn")
+	public R selectIn() {
+		return R.data(deptService.selectIn());
+	}
 }

--
Gitblit v1.9.3