From 23378ad3e494d226909df417db7559b31c2eca3f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 14 Aug 2021 18:32:56 +0800
Subject: [PATCH] 保安员列表查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 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 b320444..e5c50d2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -63,6 +63,10 @@
sys_live_location sll
on
sll.worker_id = bu.id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
bu.is_deleted = 0
<if test="tenantId!=null and tenantId != ''">
@@ -82,6 +86,9 @@
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
+ </if>
+ <if test="user.roleAlias!=null and user.roleAlias != ''">
+ and (br.role_alias = '保安' or br.role_alias = '未持证保安')
</if>
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
@@ -195,6 +202,8 @@
FROM blade_user
where cardid = #{param1}
</select>
+
+
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMap">
select
--
Gitblit v1.9.3