From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IDeptService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 1b1a3d1..70f8c04 100644
--- a/src/main/java/org/springblade/modules/system/service/IDeptService.java
+++ b/src/main/java/org/springblade/modules/system/service/IDeptService.java
@@ -125,9 +125,9 @@
 	List<DeptVO> search(String deptName, Long parentId);
 	List<Map<Object,String>> selectCount();
 	List<Map<Object,String>> selectId(String id);
-	Map<Object,Object> selectHold(String deptid);
+	List<Map<String, Object>> selectHold(String deptid);
 	List<String> selectIn();
-	List<DeptVO> securityLazyTree(String tenantId, Long parentId);
+	List<DeptVO> securityLazyTree(String jurisdiction, Long parentId);
 
 	/**
 	 * 懒加载获取部门树形结构(包含用户数据)
@@ -140,4 +140,5 @@
 	 * @return
 	 */
 	List<TreeNodes> lazyTreeUsers(Integer type, Long deptId);
+
 }

--
Gitblit v1.9.3