From ba0f00cf00c2a5c693e9608a56d1f7d032f5e216 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 23 Mar 2021 19:19:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml |    2 +-
 1 files changed, 1 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..f2e6aaf 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
@@ -113,7 +113,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