From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 4613cb7..bb58ace 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -97,10 +97,10 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account != #{user.account}
+ and account like concat('%', #{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name like concat(concat('%', #{user.realName}),'%')
+ and real_name like concat('%', #{user.realName},'%')
</if>
<if test="user.deptId!=null and user.deptId != ''">
and dept_id like concat(concat('%', #{user.deptId}),'%')
@@ -148,7 +148,7 @@
<select id="selectUserPages" resultMap="userResultMaps">
select
bu.*,
- TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()) age
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age
from
blade_user bu
left join
@@ -178,7 +178,7 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1123598813738675201'">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
@@ -191,7 +191,9 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*,bd.dept_name as deptName
+ bu.*,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( bu.cardid,7,4),0) age,
+ bd.dept_name as deptName
from
blade_user bu
left join
@@ -229,7 +231,7 @@
and bu.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
- and bu.securitynumber = #{user.securitynumber}
+ and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
<if test="user.deptId!=null and user.deptId!=''">
and bu.dept_id =#{user.deptId}
@@ -291,4 +293,19 @@
where examination_type is 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
+ from
+ blade_user bu
+ left join
+ blade_dept bd
+ on
+ bu.dept_id = bd.id
+ where securitynumber = #{securityNumber}
+ </select>
+
</mapper>
--
Gitblit v1.9.3