From c0bf52690604d78dcbff7bf465e088133f1d2eea Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 11 Aug 2021 11:30:51 +0800
Subject: [PATCH] 1.表现,从业记录通过保安员编码查询
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 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 68defdc..6eb943b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -166,16 +166,21 @@
dept.dept_name AS label,
dept.id AS "key",
dept.id AS "value",
+ 1 as idCardNo,
(
SELECT
CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
FROM
blade_dept
WHERE
- parent_id = dept.id and is_deleted = 0
+ parent_id = dept.id and dept.is_deleted = 0
) AS "has_children"
FROM
blade_dept dept
+ left join
+ blade_user bu
+ on
+ bu.dept_id = dept.id
WHERE
dept.is_deleted = 0
<if test="type==1">
@@ -185,6 +190,11 @@
<if test="type==2 or type==3">
and dept_category=2
AND dept.parent_id = "1123598813738675201"
+ </if>
+ <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+ and dept_category=1
+ AND dept.parent_id = "1413470343230877697"
+ and bu.jurisdiction = #{jurisdiction}
</if>
)
@@ -196,6 +206,7 @@
bu.real_name AS label,
bu.id AS "key",
bu.id AS "value",
+ bu.cardid as idCardNo,
0 as "has_children"
from blade_user bu
left join
@@ -209,6 +220,10 @@
<if test="type==2 or type==3">
and dept_category=2
</if>
+ <if test="type==4 and jurisdiction!=null and jurisdiction!=''">
+ and dept_category=1
+ and bu.jurisdiction = #{jurisdiction}
+ </if>
)
)c
</select>
--
Gitblit v1.9.3