From af3a424da554f249cf4d732c186595fa4c5906f7 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Nov 2021 16:00:12 +0800
Subject: [PATCH] 验收版取消ftp
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 ea02906..79a047b 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -47,6 +47,7 @@
<result column="birthtime" property="birthtime"/>
<result column="healstats" property="healstats"/>
<result column="soil" property="soil"/>
+ <result column="reason_for_leav" property="reasonForLeav"/>
</resultMap>
<!--带坐标-->
@@ -65,6 +66,10 @@
sys_information si
on
si.departmentid = bd.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
left join
sys_live_location sll
on
@@ -97,7 +102,7 @@
and bu.status = #{user.status}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
- and si.jurisdiction = #{user.jurisdiction}
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
--
Gitblit v1.9.3