From a693e3cd9fbd5c016ac4b905fa4e2bb2dbdf1f47 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 13 Mar 2023 10:37:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java |    7 +++++++
 1 files changed, 7 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 f6a10ff..9502c4d 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.system.dto.DeptDTO;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.vo.DeptVO;
 
@@ -65,4 +66,10 @@
 	 */
 	List<String> getDeptNames(Long[] ids);
 
+	/**
+	 * 获取部门分组和部门下的用户
+	 * @return
+	 */
+	List<DeptDTO> getUserGroupByDept();
+
 }

--
Gitblit v1.9.3