From ebb5012dc221db17bfad74c3bdfd91d46aa29c03 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 11:24:41 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 14 ++++++++++++--
1 files changed, 12 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 ea02906..361bfa5 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},'%')
@@ -114,7 +119,10 @@
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat('%', #{user.cardid},'%')
</if>
- <if test="user.examinationType!=null and user.examinationType != ''">
+ <if test="user.examinationType==0">
+ and (bu.examination_type = #{user.examinationType} or bu.examination_type is null or bu.examination_type="")
+ </if>
+ <if test="user.examinationType==1">
and bu.examination_type = #{user.examinationType}
</if>
ORDER BY bu.id
@@ -190,6 +198,8 @@
SELECT id, name, real_name RealName
FROM blade_user
where cardid = #{param1}
+ and is_deleted = 0
+ and status = 1
</select>
--
Gitblit v1.9.3