From afda08833e460a40a2d4e509f9df9d809c6f8f31 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Mar 2021 15:38:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
index 9986d39..001cc30 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml
@@ -74,6 +74,11 @@
ORDER BY sort
</select>
+ <select id="trees" resultMap="treeNodeResultMap">
+ select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
+ ORDER BY sort
+ </select>
+
<select id="lazyTree" resultMap="treeNodeResultMap" >
SELECT
dept.id,
@@ -113,7 +118,7 @@
</select>
<select id="selectInfo" resultType="java.util.HashMap">
- select id as deptid,dept_name from blade_dept
+ select id as deptid,dept_name from blade_dept where tenant_id=963841 and is_deleted=0 and parent_id!=0
</select>
</mapper>
--
Gitblit v1.9.3