From 92d375e11f68b898cd8a46cf02bcb82cd469ded5 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 02 Sep 2021 11:58:02 +0800
Subject: [PATCH] 1.ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 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 d8a3b6e..785194e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -299,30 +299,39 @@
<!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
<select id="getSecurityApplyTree" resultType="org.springblade.modules.system.node.TreeNode">
- (select #{user.deptId} as id,
- '全部' as name,
- 0 as parentId
- from blade_user)
+ (
+ 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
+ distinct
+ 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 bu.status = 1
+ and bd.dept_category = 1
+ and (hold = 2 or hold = 3)
+ and bd.id = #{user.deptId}
+ <if test="user.examType==1">
+ and bu.is_apply != 1
+ </if>
+ <if test="user.examType==2">
+ and bu.is_train != 1
+ </if>
)
</select>
@@ -367,12 +376,8 @@
<!--根据保安员编码查询保安信息-->
<select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
select
- bu.id,
- bu.avatar,
- bu.securitynumber securityNumber,
+ bu.*,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
- bu.real_name realName,
- bu.sex,
bd.dept_name deptName
from
blade_user bu
--
Gitblit v1.9.3