From 454ec801479b822c8225ed2c963f7f643b1ca7c6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 11:17:11 +0800
Subject: [PATCH] 保安员查询新增身份证号模糊查询

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   17 +++++++++++++++++
 1 files changed, 17 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 1bdcbf1..e839a2f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -39,6 +39,12 @@
         <result column="hold" property="hold"/>
         <result column="jurisdiction" property="jurisdiction"/>
         <result column="securitynumber" property="securitynumber"/>
+        <result column="examinationType" property="examinationType"/>
+        <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">
@@ -51,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}
@@ -109,6 +118,9 @@
         <if test="user.account!=null and user.account != ''">
             and bu.account != #{user.account}
         </if>
+        <if test="user.cardid!=null and user.cardid != ''">
+            and bu.cardid like concat(concat('%', #{user.cardid}),'%')
+        </if>
         <if test="user.realName!=null and user.realName != ''">
             and bu.real_name like concat(concat('%', #{user.realName}),'%')
         </if>
@@ -167,4 +179,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