From fb981e36e0c8a4a32f37edbce1b8409d75b0f842 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 25 Aug 2021 10:03:55 +0800
Subject: [PATCH] 1.单位
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 +++++--
1 files changed, 5 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 1e2d4ab..693415c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -178,7 +178,7 @@
</if>
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
- </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ </if> <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1123598813738675201'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
@@ -191,7 +191,7 @@
<!--保安员列表-->
<select id="selectUserPageSecurity" resultMap="userResultMaps">
select
- bu.*
+ bu.*,bd.dept_name as deptName
from
blade_user bu
left join
@@ -228,6 +228,9 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
+ <if test="user.deptId!=null and user.deptId!=''">
+ and bu.dept_id =#{user.deptId}
+ </if>
<if test="user.useName==null or user.useName==''">
order by bu.id
</if>
--
Gitblit v1.9.3