From 3b1bba4cae03694d1364115b9cd539bee066ce7e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 10 Sep 2021 15:50:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 6 +-----
1 files changed, 1 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 f91676f..7fd9939 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -93,7 +93,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 != ''">
@@ -219,7 +219,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 +267,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 != ''">
@@ -324,7 +321,6 @@
bu.is_deleted = 0
and bu.status = 1
and bu.examination_type != 1
- and bd.dept_category = 1
and (hold = 2 or hold = 3)
and bd.id = #{user.deptId}
<if test="user.examType==1">
--
Gitblit v1.9.3