From 61e8c756cc2a9e503d643672f103c3837fadc1d4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 21:27:28 +0800
Subject: [PATCH] 保安员，保安公司查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 13 +++++++------
1 files changed, 7 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 d61feb3..d8a3b6e 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -213,10 +213,14 @@
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
- bd.dept_category = 1
+ and bd.dept_category = 1
+ and role_alias = '保安'
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -242,9 +246,6 @@
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
- </if>
- <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}
@@ -369,7 +370,7 @@
bu.id,
bu.avatar,
bu.securitynumber securityNumber,
- ifnull(TIMESTAMPDIFF(YEAR, bu.birthday, CURDATE()),0) age,
+ ifnull(DATE_FORMAT(NOW(), '%Y') - SUBSTRING( cardid,7,4),0) age,
bu.real_name realName,
bu.sex,
bd.dept_name deptName
--
Gitblit v1.9.3