From a05af1da676dac2cb8a952a38f40d93be626cbf7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 26 Jul 2021 17:04:24 +0800
Subject: [PATCH] 1.装备管理
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index 3f6f796..b07c189 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -149,18 +149,31 @@
blade_dept dept
WHERE
dept.is_deleted = 0
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ AND dept.id = #{parentId}
+ </if>
)
union
(select
- id,
- dept_id parent_id,
- real_name AS title,
- id AS "value",
- id AS "key",
+ bu.id,
+ bu.dept_id parent_id,
+ bu.real_name AS title,
+ bu.id AS "value",
+ bu.id AS "key",
0 as "has_children"
- from blade_user
+ from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ where 1=1
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ AND bu.dept_id = #{parentId}
+ </if>
)
)c
</select>
@@ -234,4 +247,9 @@
SELECT id FROM blade_dept WHERE parent_id =#{id} and is_deleted = 0
</select>
+
+ <insert id="add" parameterType="org.springblade.modules.system.entity.Dept" useGeneratedKeys="true" keyProperty="id">
+ insert into blade_dept(tenant_id, parent_id,ancestors,dept_category,dept_name) values(#{tenantId}, #{parentId}, #{ancestors}, #{deptCategory}, #{deptName})
+ </insert>
+
</mapper>
--
Gitblit v1.9.3