From 70510d49fc0381d40642857466fa7165d33027e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Sep 2021 11:16:56 +0800
Subject: [PATCH] 荣誉录入新增发证机关字段，保安员查询接口修改，保安公司查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 bb58ace..f8e27b0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -92,7 +92,8 @@
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
- select * from blade_user where is_deleted = 0
+ select * from blade_user
+ where is_deleted = 0
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
</if>
@@ -157,6 +158,9 @@
si.departmentid = bu.dept_id
where is_deleted = 0
and status = 1
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
</if>
@@ -200,12 +204,19 @@
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
+ 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>
--
Gitblit v1.9.3