From 7bff730b851e2cdba41309bc8a8aaf8e7421ef3c Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 28 Apr 2021 14:25:41 +0800
Subject: [PATCH] 2.用户注册部门下拉选择

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.java            |    2 +-
 blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java |    2 +-
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml             |   20 +++++++++++++++++++-
 blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java         |    2 +-
 4 files changed, 22 insertions(+), 4 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 7341310..c6b718e 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
@@ -83,7 +83,7 @@
 	 * @return
 	 */
 	List<String> getDeptNames(Long[] ids);
-	List selectInfo();
+	List<DeptVO> selectInfo();
 
 	/**
 	 * 查询所有的部门信息
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 810b31b..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,25 @@
     </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>
 
     <!--查询所有的部门信息-->
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
index 207e915..80c3045 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/IDeptService.java
@@ -117,7 +117,7 @@
 	 * @return
 	 */
 	boolean submit(Dept dept);
-	List selectInfo();
+	List<DeptVO> selectInfo();
 
 	/**
 	 * 查询所有的部门信息
diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
index e68a7c7..b109780 100644
--- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
+++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java
@@ -156,7 +156,7 @@
 	}
 
 	@Override
-	public List selectInfo() {
+	public List<DeptVO> selectInfo() {
 		return baseMapper.selectInfo();
 	}
 

--
Gitblit v1.9.3