From d5041a59d46d5c84f9606fac4bdd857784ea32c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 10 Aug 2021 09:31:49 +0800
Subject: [PATCH] 考试报名，取消报名接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index abb9443..ce83c57 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -41,6 +41,7 @@
<result column="securitynumber" property="securitynumber"/>
<result column="dispatch" property="dispatch"/>
<result column="my_picture" property="myPicture"/>
+ <result column="is_apply" property="isApply"/>
<result column="deptname" property="deptname"/>
</resultMap>
@@ -207,7 +208,6 @@
<select id="selectUserPageSecurityApply" resultMap="userResultMap">
select
bu.*,
- sa.id applyId,sa.apply_status applyStatus,
bd.dept_name
from
blade_user bu
@@ -215,10 +215,6 @@
blade_dept bd
on
bu.dept_id = bd.id
- left join
- sys_apply sa
- on
- sa.user_id = bu.id
where
bu.is_deleted = 0
and
@@ -234,8 +230,8 @@
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
- <if test="user.applyStatus!=null">
- and sa.apply_status = #{user.applyStatus}
+ <if test="user.isApply!=null">
+ and sa.is_apply = #{user.isApply}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -268,4 +264,34 @@
ORDER BY bu.id
</select>
+
+ <!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
+ <select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
+ (select #{user.deptId} as id,
+ '全部' as name,
+ 0 as parentId
+ from blade_user)
+
+ union all
+
+ (select
+ bu.id,
+ bu.real_name as name,
+ #{user.deptId} parentId
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where
+ bu.is_deleted = 0
+ and
+ bd.dept_category = 1
+ and
+ (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ )
+ </select>
+
</mapper>
--
Gitblit v1.9.3