From bdc5d99198b06b9e3fd5e6794d2efea36398b60a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 24 Jan 2024 11:11:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.java | 8 +++++++-
1 files changed, 7 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 7a028cd..6797ece 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -47,7 +47,7 @@
* @param tenantId
* @return
*/
- List<DeptVO> tree(String tenantId);
+ List<DeptVO> tree(String tenantId, Long parentId);
/**
* 懒加载获取树形节点
@@ -72,4 +72,10 @@
* @return
*/
DeptVO getDeptById(@Param("id") Long id);
+
+ /**
+ * 查询网格对应的机构信息（包含父级机构名称）
+ * @return
+ */
+ List<DeptVO> getGridDeptAndParentList();
}
--
Gitblit v1.9.3