From 767f8e4c5b8bdb9b87c7529fe01220f7fa3671b1 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 21:52:17 +0800
Subject: [PATCH] 1.取消报名接口修改， 2.批量报名接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 b320444..b75551e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -63,6 +63,10 @@
sys_live_location sll
on
sll.worker_id = bu.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
@@ -83,6 +87,9 @@
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
</if>
+ <if test="user.roleAlias!=null and user.roleAlias != ''">
+ and (br.role_alias = '保安' or br.role_alias = '未持证保安')
+ </if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
@@ -97,6 +104,9 @@
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
+ </if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and bu.examination_type = #{user.examinationType}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and bu.id in (
@@ -148,6 +158,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
</if>
+ <if test="user.examinationType!=null and user.examinationType != ''">
+ and examination_type = #{user.examinationType}
+ </if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
SELECT
@@ -195,6 +208,8 @@
FROM blade_user
where cardid = #{param1}
</select>
+
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
@@ -374,7 +389,6 @@
sa.user_id = bu.id
where 1=1
and (hold=2 or hold = 3)
- and (sa.is_exam != 1 or sa.is_exam is null)
and (bu.is_apply != 1 or bu.is_apply is null)
and (sa.apply_status !=2 or sa.apply_status is null)
and bu.dept_id = #{deptId}
--
Gitblit v1.9.3