From fba3e940ede9233f1091e99b30dca4cf459a8e6e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Sep 2021 17:59:10 +0800
Subject: [PATCH] 查询当前公司人员
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 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 785194e..ca3b0e2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -75,8 +75,11 @@
br.id = bu.role_id
where
bu.is_deleted = 0
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
<if test="user.account!=null and user.account != ''">
- and bu.account = #{user.account}
+ and bu.account like concat('%', #{user.account},'%')
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
@@ -93,7 +96,7 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
@@ -123,7 +126,7 @@
and tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
- and account != #{user.account}
+ and account like concat('%', #{user.account},'%')
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
@@ -219,7 +222,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- 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}),'%')
@@ -268,8 +270,6 @@
bu.dept_id = bd.id
where
bu.is_deleted = 0
- and
- bd.dept_category = 1
and
(hold = 2 or hold = 3)
<if test="user.deptId!=null and user.deptId != ''">
@@ -323,7 +323,7 @@
where
bu.is_deleted = 0
and bu.status = 1
- and bd.dept_category = 1
+ and bu.examination_type != 1
and (hold = 2 or hold = 3)
and bd.id = #{user.deptId}
<if test="user.examType==1">
@@ -489,4 +489,8 @@
and sd.status = 0
</select>
+ <!--查询账号相同的数量-->
+ <select id="selectCountAccount" resultType="java.lang.Integer">
+ select count(*) from blade_user where account = #{account}
+ </select>
</mapper>
--
Gitblit v1.9.3