From 958ddfcec71043b6b800feaac521e7b22bb15e97 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 29 Apr 2021 09:10:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml |   25 ++++++++++++++++++++++++-
 1 files changed, 24 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 9519faa..02c37f7 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
@@ -158,7 +158,30 @@
     </select>
 
     <select id="selectInfo" resultType="java.util.HashMap">
-        select id as deptid,dept_name from blade_dept where is_deleted=0
+        SELECT
+        dept.id,
+        dept.parent_id,
+        dept.dept_name AS title,
+        dept.id AS "value",
+        dept.id AS "key",
+        (
+        SELECT
+        CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+        FROM
+        blade_dept
+        WHERE
+        parent_id = dept.id and is_deleted = 0
+        ) AS "has_children"
+        FROM
+        blade_dept dept
+        WHERE
+         dept.is_deleted = 0
+        ORDER BY dept.sort
+    </select>
+
+    <!--查询所有的部门信息-->
+    <select id="selDeptList" resultType="org.springblade.common.vo.DeptVo">
+        select id ,dept_name deptName from blade_dept where is_deleted=0
     </select>
 
 </mapper>

--
Gitblit v1.9.3