From cd2cfd37366002f790a2ed1435962d4eff7d5cec Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 01 Jun 2021 09:39:30 +0800
Subject: [PATCH] 版本合并
---
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 81 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 76 insertions(+), 5 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..f2b9990 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
@@ -79,10 +79,30 @@
ORDER BY sort
</select>
+<!-- <select id="Batrees" resultMap="treeNodeResultMap">-->
+<!-- SELECT-->
+<!-- bu.id,-->
+<!-- if(br.role_alias = '处警员',1,2) as parent_id,-->
+<!-- bu.name AS title,-->
+<!-- bu.id AS "value",-->
+<!-- bu.id AS "key",-->
+<!-- br.role_name roleName-->
+<!-- FROM-->
+<!-- blade_user bu-->
+<!-- LEFT JOIN-->
+<!-- blade_role br-->
+<!-- ON-->
+<!-- bu.role_id = br.id-->
+<!-- WHERE-->
+<!-- bu.is_deleted = 0-->
+<!-- AND br.role_alias = '处警员' or br.role_alias = 'admin'-->
+<!-- ORDER BY-->
+<!-- sort-->
+<!-- </select>-->
<select id="Batrees" resultMap="treeNodeResultMap">
- SELECT
+ (SELECT
bu.id,
- 0 as parent_id,
+ if(br.role_alias = '处警员', 1,2) as parent_id,
bu.name AS title,
bu.id AS "value",
bu.id AS "key"
@@ -90,10 +110,38 @@
blade_user bu
LEFT JOIN blade_role br ON bu.role_id = br.id
WHERE
- br.role_alias = '处警员'
- AND bu.is_deleted = 0
+ bu.is_deleted = 0
+ AND br.role_alias = '处警员' or br.role_alias = 'admin'
+
ORDER BY
sort
+ )
+
+
+ union all
+
+ (SELECT
+ 1 id,
+ 0 parent_id,
+ '处警员' title,
+ 1 "value",
+ 1 "key"
+ FROM
+ blade_user bu
+ limit 1)
+
+ union all
+
+ (SELECT
+ 2 id,
+ 0 parent_id,
+ '管理员' title,
+ 2 "value",
+ 2 "key"
+ FROM
+ blade_user bu
+ limit 1
+ )
</select>
<select id="lazyTree" resultMap="treeNodeResultMap" >
@@ -158,7 +206,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