From 2063a93b5f7d4837e0dfd7c2c3c936af8419700f Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 20:28:56 +0800
Subject: [PATCH] 1.备案

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   33 ++++++++++++++++++++++++++++++++-
 1 files changed, 32 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 df14164..7a4439a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -45,6 +45,8 @@
         <result column="is_apply" property="isApply"/>
         <result column="is_train" property="isTrain"/>
         <result column="birthtime" property="birthtime"/>
+        <result column="healstats" property="healstats"/>
+        <result column="soil" property="soil"/>
     </resultMap>
 
     <!--带坐标-->
@@ -96,6 +98,9 @@
         </if>
         <if test="user.realName!=null and user.realName != ''">
             and bu.real_name like concat('%', #{user.realName},'%')
+        </if>
+        <if test="user.dispatch!=null and user.dispatch != ''">
+            and bu.dispatch = #{user.dispatch}
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and bu.user_type = #{user.userType}
@@ -312,7 +317,7 @@
 
     <select id="selectInr" resultType="java.util.HashMap">
         SELECT real_name as realName,id FROM  blade_user
-        WHERE role_id='1412226235153731586'
+        WHERE role_id='1412226235153731586' and status=1
           <if test="deptid!=null and deptid!='' and dept!='1123598813738675201'">
               and dept_id=#{deptid}
           </if>
@@ -345,4 +350,30 @@
     <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>
+
+
+    <!--根据保安员编码查询保安信息-->
+    <select id="getUserInfoBySecurityNumber" resultType="org.springblade.modules.system.vo.UserVO">
+        select
+        bu.id,
+        bu.avatar,
+        bu.securitynumber securityNumber,
+        ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
+        bu.real_name realName,
+        bu.sex,
+        bd.dept_name deptName
+         from
+         blade_user bu
+         left join
+         blade_dept bd
+         on
+         bu.dept_id = bd.id
+        where securitynumber = #{securityNumber}
+    </select>
+
+
+    <select id="selectUser" resultType="java.util.HashMap">
+        select CAST(id AS CHAR) as groupmember,real_name as rname from blade_user
+    </select>
+
 </mapper>

--
Gitblit v1.9.3