From 4109b78cc40a6820e92322b78fcc933003f8c1f3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 13 May 2021 20:59:14 +0800
Subject: [PATCH] 处警人员树接口修改
---
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/DeptServiceImpl.java | 1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml | 56 ++++++++++++++++++++++++++--
blade-service/blade-system/pom.xml | 15 +++++++
3 files changed, 68 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-system/pom.xml b/blade-service/blade-system/pom.xml
index 403ea22..29d8805 100644
--- a/blade-service/blade-system/pom.xml
+++ b/blade-service/blade-system/pom.xml
@@ -37,6 +37,21 @@
<artifactId>blade-user-api</artifactId>
<version>${bladex.project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-common</artifactId>
+ <version>${bladex.project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-dict-api</artifactId>
+ <version>${bladex.project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springblade</groupId>
+ <artifactId>blade-scope-api</artifactId>
+ <version>${bladex.project.version}</version>
+ </dependency>
</dependencies>
<build>
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 02c37f7..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" >
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 b109780..0540914 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
@@ -23,6 +23,7 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
+import org.springblade.core.tool.node.TreeNode;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
import org.springblade.system.cache.SysCache;
--
Gitblit v1.9.3