From 8ca64d03d58db959d95f49119be0cb322d6edf2f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Jul 2021 17:25:24 +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 e0ee495..aee8a53 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.java
@@ -18,6 +18,7 @@
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
 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;
 
@@ -92,5 +93,11 @@
 	 * @return
 	 */
 	@SqlParser(filter=true)
-	List<DeptVO> lazyTreeUser(String tenantId, Long parentId);
+	List<DeptVO> lazyTreeUser(String tenantId, @Param("parentId") Long parentId);
+	Long add(Dept dept);
+
+	/**
+	 * 懒加载获取部门树形结构(按分类查询)
+	 */
+	List<DeptVO> lazyTreeType(String tenantId, String deptCategory, Long parentId);
 }

--
Gitblit v1.9.3