From 37e8b95d39c30dd0f59d2dcc2b73fb64ee493a42 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Oct 2021 15:38:36 +0800
Subject: [PATCH] 保安员新增修改接口修改
---
src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
index 603c490..99a1318 100644
--- a/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
+++ b/src/main/java/org/springblade/modules/social/mapper/SocialMapper.xml
@@ -27,15 +27,29 @@
u.real_name as realname
FROM
sys_socil s
- LEFT JOIN blade_user u ON s.namb = u.id where 1=1
+ LEFT JOIN
+ blade_user u
+ ON
+ s.namb = u.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = s.jurisdiction
+ where 1=1
+ and u.is_deleted = 0
+ AND u.status = 1
+ AND u.role_id = '1412226235153731586'
+ <if test="social.jurisdiction!=null and social.jurisdiction!='' and social.jurisdiction!='1372091709474910209'">
+ and (sj.id=#{social.jurisdiction} or sj.parent_id = #{social.jurisdiction})
+ </if>
<if test="social.realname!=null and social.realname!=''">
and u.real_name like concat(concat('%', #{social.realname}),'%')
</if>
+ <if test="social.namb!=null and social.namb!=''">
+ and s.namb=#{social.namb}
+ </if>
<if test="social.deptid!=null and social.deptid!=''">
and s.deptid=#{social.deptid}
- </if>
- <if test="social.jurisdiction!=null and social.jurisdiction!=''">
- and s.jurisdiction=#{social.jurisdiction}
</if>
</select>
--
Gitblit v1.9.3