From a4ff2b571be305e2641c9dd67797f4102e795ebb Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 25 Apr 2021 10:47:56 +0800
Subject: [PATCH] 1.App警情反馈接口调整 2.租户接口新增

---
 blade-service/blade-system/src/main/java/org/springblade/system/mapper/DeptMapper.xml |   47 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 46 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 f2e6aaf..9519faa 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
@@ -74,6 +74,28 @@
         ORDER BY sort
     </select>
 
+    <select id="trees" resultMap="treeNodeResultMap">
+        select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
+        ORDER BY sort
+    </select>
+
+    <select id="Batrees" resultMap="treeNodeResultMap">
+        SELECT
+            bu.id,
+            0 as parent_id,
+            bu.name AS title,
+            bu.id AS "value",
+            bu.id AS "key"
+        FROM
+            blade_user bu
+            LEFT JOIN blade_role br ON bu.role_id = br.id
+        WHERE
+            br.role_alias = '处警员'
+            AND bu.is_deleted = 0
+        ORDER BY
+            sort
+    </select>
+
     <select id="lazyTree" resultMap="treeNodeResultMap" >
         SELECT
             dept.id,
@@ -99,6 +121,29 @@
         ORDER BY dept.sort
     </select>
 
+    <select id="lazyTrees" resultMap="treeNodeResultMap" >
+        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.parent_id = #{param2} AND dept.is_deleted = 0
+            and dept.tenant_id != 000000
+        ORDER BY dept.sort
+    </select>
+
     <select id="getDeptNames" resultType="java.lang.String">
         SELECT
         dept_name
@@ -113,7 +158,7 @@
     </select>
 
     <select id="selectInfo" resultType="java.util.HashMap">
-        select id as deptid,dept_name from blade_dept where tenant_id=963841 and is_deleted=0 and parent_id!=0
+        select id as deptid,dept_name from blade_dept where is_deleted=0
     </select>
 
 </mapper>

--
Gitblit v1.9.3