From 4f5952c0082ef451dbf2c7ac4c2fb6055cb02f38 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 18 Aug 2021 11:58:00 +0800
Subject: [PATCH] 开始考试接口调用修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 166 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 100 insertions(+), 66 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 49f4e2a..aed1aaf 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -159,80 +159,114 @@
<!--懒加载获取部门树形结构(包含用户数据)app-->
<select id="lazyTreeUserApp" resultType="org.springblade.modules.system.vo.DeptAndUserVO" >
- select DISTINCT * from (
- (SELECT
- dept.id,
- dept.parent_id,
- 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 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">
+ select DISTINCT
+ c.id,
+ c.parent_id,
+ c.title,
+ c.value,
+ c.key,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ where
+ id = c.parent_id
and dept_category=1
- AND dept.parent_id = "1413470343230877697"
- </if>
- <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>
- )
+ ) AS "has_children"
+ from (
+ (SELECT
+ dept.id,
+ dept.parent_id,
+ 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 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"
+ </if>
+ <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>
+ )
- union all
+ union all
- (select
- bu.id,
- bu.dept_id parent_id,
- 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
- blade_dept bd
- 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>
- )
+ (
+ select
+ bu.id,
+ bu.dept_id parent_id,
+ 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
+ blade_dept bd
+ 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
</select>
<!--懒加载获取部门树形结构(包含用户数据)-->
<select id="lazyTreeUser" resultMap="treeNodeResultMap" >
- select DISTINCT * from (
+ select DISTINCT
+ c.id,
+ c.parent_id,
+ c.title,
+ c.value,
+ c.key,
+ (
+ SELECT
+ CASE WHEN count(1) > 0 THEN 1 ELSE 0 END
+ FROM
+ blade_dept
+ where
+ id = c.parent_id
+ <if test="parentId!=null and parentId!=''">
+ and dept_category=1
+ AND id = #{parentId}
+ </if>
+ ) AS "has_children"
+ from (
(SELECT
dept.id,
dept.parent_id,
--
Gitblit v1.9.3