From 977444532d644d48b5b55ca89a1e3d62b5dd8782 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 19 May 2021 17:57:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 3bede8c..45f8c7a 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -159,6 +159,7 @@
bu.role_id=br.id
where
br.role_alias ='处警员'
+ and bu.is_deleted=0
<if test="user.realName!=null and user.realName !=''">
<bind name="realName" value="'%'+user.realName+'%'"/>
and bu.real_name like #{realName}
@@ -169,4 +170,9 @@
</if>
order by bu.code asc
</select>
+
+ <!--根据用户编号查询用户信息-->
+ <select id="selUserByCode" resultType="org.springblade.system.user.entity.User">
+ select code,dept_id deptId from blade_user where is_deleted = 0 and code=#{code}
+ </select>
</mapper>
--
Gitblit v1.9.3