From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 6e5e9ad..897fd9f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -43,6 +43,8 @@
<result column="examinationMx" property="examinationMx"/>
<result column="fingerprint" property="fingerprint"/>
<result column="photo" property="photo"/>
+ <result column="dispatch" property="dispatch"/>
+ <result column="my_picture" property="myPicture"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
@@ -55,6 +57,9 @@
</if>
<if test="user.realName!=null and user.realName != ''">
and real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and dept_id like concat(concat('%', #{user.deptId}),'%')
</if>
<if test="user.userType!=null and user.userType != ''">
and user_type = #{user.userType}
@@ -171,4 +176,9 @@
update blade_user set hold=#{hold} where cardid=#{cardid}
</update>
+ <!--查询所有未注销用户-->
+ <select id="getAllUserList" resultType="org.springblade.modules.system.entity.User">
+ select id,cardid from blade_user where is_deleted = 0
+ </select>
+
</mapper>
--
Gitblit v1.9.3