From 834f4b42af823fc58c43ce99e330dbeb2b98df5d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 22 Nov 2021 09:18:10 +0800
Subject: [PATCH] 保安员查询接口调整，排序按id 倒序排序
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 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 1fa857b..227c70f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -54,7 +54,7 @@
<select id="selectUserPages" resultMap="userResultMap">
select
distinct
- bu.*,
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs,
sll.longitude,sll.latitude,
bd.dept_name
from
@@ -95,7 +95,7 @@
and bu.hold = #{user.hold}
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and bu.dept_id = #{user.deptId}
+ and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -108,6 +108,9 @@
</if>
<if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
and str.training_unit_id = #{user.trainingUnitId}
+ </if>
+ <if test="user.deptName!=null and user.deptName != ''">
+ and bd.dept_name like concat('%', #{user.deptName},'%')
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
@@ -130,7 +133,7 @@
<if test="user.examinationType!=null and user.examinationType != ''">
and bu.examination_type = #{user.examinationType}
</if>
- ORDER BY bu.id
+ ORDER BY bu.id desc
</select>
<select id="selectUserPage" resultMap="userResultMap">
@@ -140,19 +143,22 @@
on
bd.id = bu.dept_id
left join
- sys_information si
- on
- si.departmentid = bd.id
- left join
sys_jurisdiction sj
on
- sj.id = si.jurisdiction
+ sj.id = bu.jurisdiction
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where bu.is_deleted = 0
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
and account like concat('%', #{user.account},'%')
+ </if>
+ <if test="user.roleId!=null and user.roleId != ''">
+ and br.role_alias = '公安管理员'
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
@@ -184,7 +190,7 @@
<if test="user.examinationType!=null and user.examinationType != ''">
and examination_type = #{user.examinationType}
</if>
- ORDER BY bu.id
+ ORDER BY bu.id desc
</select>
<select id="getUser" resultMap="userResultMap">
@@ -227,7 +233,7 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
- bu.*
+ bu.*,IF(mod(SUBSTR(bu.cardid,17,1),2),1,2) sexs
from
blade_user bu
left join
@@ -397,7 +403,7 @@
<!--计算保安人员年龄-->
<select id="getUserAgeById" resultType="org.springblade.modules.system.vo.UserVO">
- select id,ifnull(TIMESTAMPDIFF(YEAR, birthday, CURDATE()),0) age,securitynumber,cardid
+ select id,ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING(cardid,7,4),0) age,securitynumber,cardid
from
blade_user
where
@@ -584,5 +590,43 @@
and br.role_alias = "保安"
</select>
+ <!--保安员列表树 安员列表树，帅选无保安证,下拉tree-->
+ <select id="getSecurityDispatcherTree" resultType="org.springblade.modules.system.node.TreeNode">
+ (
+ select #{user.deptId} as id,
+ '全选' as name,
+ 0 as parentId
+ from blade_user
+ )
+
+ union all
+
+ (
+ select
+ distinct
+ bu.id,
+ bu.real_name as name,
+ #{user.deptId} parentId
+ 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
+ where
+ bu.is_deleted = 0
+ and bu.status = 1
+ and bd.is_deleted = 0
+ and bd.id = #{user.deptId}
+ and br.role_alias = '保安'
+ and bu.dispatch = 1
+ )
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3