From 37e8b95d39c30dd0f59d2dcc2b73fb64ee493a42 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 15:38:36 +0800
Subject: [PATCH] 保安员新增修改接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 insertions(+), 4 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 76e8469..c4802b1 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -207,9 +207,12 @@
<!--通过 身份证号查询用户信息-->
<select id="getUserInfoByIdCardNo" resultType="org.springblade.modules.system.entity.User">
- SELECT id, name, real_name RealName
+ SELECT id, name, real_name RealName,securitynumber
FROM blade_user
- where cardid = #{param1}
+ where 1=1
+ and is_deleted = 0
+ and status = 1
+ and cardid = #{param1}
</select>
@@ -386,7 +389,11 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age from blade_user where id = #{userId}
+ select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age,securitynumber,cardid
+ from
+ blade_user
+ where
+ id = #{userId}
</select>
@@ -516,7 +523,10 @@
<!--查询账号相同的数量-->
<select id="selectCountAccount" resultType="java.lang.Integer">
- select count(*) from blade_user where account = #{account}
+ select count(*) from blade_user where 1=1
+ and status = 1
+ and is_deleted = 0
+ and account = #{account}
</select>
<!--查询当前部门名称及父级部门名称-->
@@ -535,4 +545,34 @@
and is_deleted = 0
and status = 1
</select>
+
+
+ <!--现场检查获取保安员-->
+ <select id="getSecurityInfo" resultType="java.util.HashMap">
+ select bu.*,si.jurisdiction from blade_user bu
+ left join
+ blade_dept bd
+ on
+ bd.id = bu.dept_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
+ where
+ 1=1
+ <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+ </if>
+ and bu.status = 1
+ and bu.is_deleted = 0
+ and br.role_alias = "保安"
+ </select>
</mapper>
--
Gitblit v1.9.3