From 6036a3f2b7fba39cb6ec2a6e2a61b5ee06d5076f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 30 Nov 2021 10:29:23 +0800
Subject: [PATCH] ftp mysql 连接修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 72 +++++++++++++++++++++++++++++++-----
1 files changed, 62 insertions(+), 10 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 8a180f4..6541c99 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -156,9 +156,9 @@
sys_information si
on
si.departmentid = bu.dept_id
- LEFT JOIN sys_performance p ON p.departmentid = bu.dept_id
LEFT JOIN blade_dept d ON bu.dept_id = d.id
LEFT JOIN sys_jurisdiction j ON j.id = si.jurisdiction
+ LEFT JOIN sys_performance p ON p.cardid = bu.cardid
where bu.is_deleted = 0
and bu.status = 1
<if test="user.realName!=null and user.realName != ''">
@@ -228,6 +228,27 @@
and bd.parent_id!=1425365577303621633
and bd.id != 1425365577303621633
and bd.id != 1432625856013971457
+ <if test="user.deptId!=null and user.deptId!=''">
+ and bd.id in
+ (
+ select id from blade_dept where id = #{user.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{user.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
+ </if>
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -243,20 +264,26 @@
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
+ <if test="user.type!=null">
+ and bu.equipment_code is not null
+ </if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
- </if>
- <if test="user.deptId!=null and user.deptId!=''">
- and bu.dept_id =#{user.deptId}
</if>
<if test="user.startTime!=null and user.startTime!=''">
and bu.paper_time >= #{user.startTime}
@@ -265,7 +292,7 @@
and bu.paper_time <= #{user.endTime}
</if>
<if test="user.useName==null or user.useName==''">
- order by bu.id
+ order by bu.examination_type desc,bu.id
</if>
<if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
order by bu.examination_type ${user.sort}
@@ -318,14 +345,15 @@
<select id="getNotAuditAllUserList" resultType="org.springblade.modules.system.entity.User">
select id, cardid
from blade_user
- where examination_type is null
+ where 1=1
+ and (examination_type is null or examination_type="" or examination_type=null)
</select>
<!--根据保安员编码查询保安信息-->
<select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
select bu.*,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid, 7, 4), 0) age,
- bd.dept_name deptName
+ bd.dept_name deptName
from blade_user bu
left join
blade_dept bd
@@ -343,7 +371,7 @@
bu.cardid,
ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
bu.phone,
- if(bu.examination_type=0,'正常','异常') examinationType,
+ if(bu.examination_type=1,'异常','正常') examinationType,
bu.examination_mx examinationMx,
bu.paper_time paperTime
from
@@ -401,7 +429,25 @@
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
<if test="user.deptId!=null and user.deptId!=''">
- and bu.dept_id =#{user.deptId}
+ and bd.id in
+ (
+ select id from blade_dept where id = #{user.deptId}
+ union
+ SELECT
+ id
+ FROM
+ (
+ SELECT
+ t1.id,t1.parent_id,t1.dept_name,
+ IF
+ ( find_in_set( parent_id, @pids ) > 0, @pids := concat( @pids, ',', id ), 0 ) AS ischild
+ FROM
+ ( SELECT id, parent_id,dept_name FROM blade_dept t ORDER BY parent_id, id ) t1,
+ ( SELECT @pids := #{user.deptId} ) t2
+ ) t3
+ WHERE
+ ischild != 0
+ )
</if>
<if test="user.startTime!=null and user.startTime!=''">
and bu.paper_time >= #{user.startTime}
@@ -409,8 +455,14 @@
<if test="user.endTime!=null and user.endTime!=''">
and bu.paper_time <= #{user.endTime}
</if>
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
+ and bu.examination_type = #{user.examinationType}
+ </if>
<if test="user.useName==null or user.useName==''">
- order by bu.id
+ order by bu.examination_type desc,bu.id
</if>
<if test="user.useName!=null and user.useName!='' and user.useName=='examinationType'">
order by bu.examination_type ${user.sort}
--
Gitblit v1.9.3