From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 20 +++++++++++++++++++-
1 files changed, 19 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..49f4e2a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -166,18 +166,24 @@
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
+ and bu.is_deleted = 0
<if test="type==1">
and dept_category=1
AND dept.parent_id = "1413470343230877697"
@@ -185,6 +191,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 +207,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
@@ -203,11 +215,16 @@
on
bd.id = bu.dept_id
where 1=1
+ and bu.is_deleted = 0
<if test="type==1">
and dept_category=1
</if>
<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
@@ -255,6 +272,7 @@
on
bd.id = bu.dept_id
where 1=1
+ and bu.is_deleted = 0
<if test="parentId!=null and parentId!=''">
and dept_category=1
AND bu.dept_id = #{parentId}
--
Gitblit v1.9.3