From 642414e16907bdd2a47642a9a83c1bc002c6b081 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 12 Aug 2021 20:49:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
index 291ab11..0a9e9c2 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/DeptServiceImpl.java
@@ -228,10 +228,11 @@
/**
* 懒加载获取部门树形结构(包含用户数据)app
* @param type 1:保安对保安 2：保安向民警 3：民警向民警
+ * @param jurisdiction 辖区id
* @return
*/
@Override
- public List<DeptVO> lazyTreeUserApp(Integer type) {
- return ForestNodeMerger.merge(baseMapper.lazyTreeUserApp(type));
+ public List<DeptVO> lazyTreeUserApp(Integer type,String jurisdiction) {
+ return ForestNodeMerger.merge(baseMapper.lazyTreeUserApp(type,jurisdiction));
}
}
--
Gitblit v1.9.3