From 30b3905e88495611704e356a1d3ced094e2a503d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 25 Oct 2021 16:56:16 +0800
Subject: [PATCH] 1.登录返回数据修改 2.现场检查接口修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   56 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 47 insertions(+), 9 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..96ae4de 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,19 +191,36 @@
     <!--保安员列表-->
     <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
         blade_dept bd
         on
         bu.dept_id = bd.id
+        left join
+        blade_role br
+        on
+        br.id = bu.role_id
+        left join
+        sys_information si
+        on
+        si.departmentid = bd.id
+        left join
+        sys_jurisdiction sj
+        on
+        sj.id = si.jurisdiction
         where
         bu.is_deleted = 0
         and
-        bd.dept_category = 1
+        br.role_alias = "安保人员"
         and
         bu.status = 1
+        and bd.parent_id!=1425365577303621633
+        and bd.id != 1425365577303621633
+        and bd.id != 1432625856013971457
         <if test="user.cardid!=null and user.cardid != ''">
             and bu.cardid like concat(concat('%', #{user.cardid}),'%')
         </if>
@@ -225,14 +242,20 @@
         <if test="user.hold!=null and user.hold != ''">
             and bu.hold = #{user.hold}
         </if>
-        <if test="user.jurisdiction!=null and user.jurisdiction != ''">
-            and bu.jurisdiction = #{user.jurisdiction}
+        <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 = #{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 &gt;= #{user.startTime}
+        </if>
+        <if test="user.endTime!=null and user.endTime!=''">
+            and bu.paper_time &lt;= #{user.endTime}
         </if>
         <if test="user.useName==null or user.useName==''">
             order by bu.id
@@ -291,4 +314,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