From 7f3f23d57a92b4c1a79c2629562936c81beae8ca Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 11 Nov 2021 12:02:43 +0800
Subject: [PATCH] 组织机构数修改，用户指纹上传修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 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 e1422a5..514ce03 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -140,13 +140,13 @@
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}
@@ -154,6 +154,9 @@
<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}),'%')
</if>
--
Gitblit v1.9.3