From 8bbcf203caac16c26ef879e0d85ceed1c6f061f4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jan 2024 10:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
index bbcb7e6..7d0b5e1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -17,6 +17,7 @@
 package org.springblade.modules.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.vo.DeptVO;
 
@@ -46,7 +47,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	List<DeptVO> tree(String tenantId);
+	List<DeptVO> tree(String tenantId, Long parentId);
 
 	/**
 	 * 懒加载获取树形节点
@@ -65,4 +66,10 @@
 	 */
 	List<String> getDeptNames(Long[] ids);
 
+	/**
+	 * 查询当前机构信息
+	 * @param id
+	 * @return
+	 */
+    DeptVO getDeptById(@Param("id") Long id);
 }

--
Gitblit v1.9.3