From ae38b2b65b709ac576eec2b507c92008a7afc3de Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 27 Apr 2021 09:26:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
index f4dbc7b..7341310 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java
@@ -17,6 +17,7 @@
 package org.springblade.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.springblade.common.vo.DeptVo;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.vo.DeptVO;
 
@@ -49,6 +50,22 @@
 	List<DeptVO> tree(String tenantId);
 
 	/**
+	 * 获取树形节点
+	 *
+	 * @param
+	 * @return
+	 */
+	List<DeptVO> trees();
+
+	/**
+	 * 获取保安树形节点
+	 *
+	 * @param
+	 * @return
+	 */
+	List<DeptVO> Batrees();
+
+	/**
 	 * 懒加载获取树形节点
 	 *
 	 * @param tenantId
@@ -56,6 +73,8 @@
 	 * @return
 	 */
 	List<DeptVO> lazyTree(String tenantId, Long parentId);
+
+	List<DeptVO> lazyTrees(String tenantId, Long parentId);
 
 	/**
 	 * 获取部门名
@@ -65,4 +84,10 @@
 	 */
 	List<String> getDeptNames(Long[] ids);
 	List selectInfo();
+
+	/**
+	 * 查询所有的部门信息
+	 * @return
+	 */
+    List<DeptVo> selDeptList();
 }

--
Gitblit v1.9.3