From f1092d53966cf3b3b93be7fc59d913cd13d2ec37 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 16:17:47 +0800
Subject: [PATCH] 1.用户新增角色关联持证字段 2.新增接口，考试开始，修改考试的状态为考试中 3.考试查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 5 +++++
1 files changed, 5 insertions(+), 0 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 e007344..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,6 +166,7 @@
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
@@ -182,6 +183,7 @@
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"
@@ -205,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
@@ -212,6 +215,7 @@
on
bd.id = bu.dept_id
where 1=1
+ and bu.is_deleted = 0
<if test="type==1">
and dept_category=1
</if>
@@ -268,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