From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IDeptService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/IDeptService.java b/src/main/java/org/springblade/modules/system/service/IDeptService.java
index abfeaa2..7e497fb 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.node.TreeNodes;
 import org.springblade.modules.system.vo.DeptVO;
 
 import java.util.List;
@@ -129,7 +130,7 @@
 	/**
 	 * 懒加载获取部门树形结构,不包含顶级管理员公安局
 	 */
-	List<DeptVO> securityLazyTree(String tenantId, Long parentId);
+	List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);
 	List<String> selectIn();
 
 	/**
@@ -150,4 +151,10 @@
 	 * @return
 	 */
 	List<DeptVO> lazyTreeUserApp(Integer type,String jurisdiction);
+
+	/**
+	 * 懒加载获取部门树形结构(包含用户数据),只查下一级的数据
+	 * @return
+	 */
+	List<TreeNodes> lazyTreeUsers(String tenantId, Long parentId);
 }

--
Gitblit v1.9.3