From 5fb38e71cc5ab8eee8e7f489c4476d59104f07df Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 14 Jul 2021 16:59:40 +0800
Subject: [PATCH] 1.接口调整

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 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 1380e8e..4886233 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -26,22 +26,47 @@
         <result column="dept_id" property="deptId"/>
         <result column="post_id" property="postId"/>
         <result column="cardid" property="cardid"/>
+        <result column="nativeplace" property="nativeplace"/>
+        <result column="nation" property="nation"/>
+        <result column="education" property="education"/>
+        <result column="politicaloutlook" property="politicaloutlook"/>
+        <result column="height" property="height"/>
+        <result column="cell" property="cell"/>
+        <result column="emails" property="emails"/>
+        <result column="address" property="address"/>
+        <result column="registered" property="registered"/>
+        <result column="rtime" property="rtime"/>
+        <result column="hold" property="hold"/>
+        <result column="jurisdiction" property="jurisdiction"/>
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">
         select * from blade_user where is_deleted = 0
-            and tenant_id!=000000
         <if test="user.tenantId!=null and user.tenantId != ''">
             and tenant_id = #{user.tenantId}
         </if>
         <if test="user.account!=null and user.account != ''">
-            and account = #{user.account}
+            and account != #{user.account}
         </if>
         <if test="user.realName!=null and user.realName != ''">
-            and real_name = #{user.realName}
+            and real_name like concat(concat('%', #{user.realName}),'%')
         </if>
         <if test="user.userType!=null and user.userType != ''">
             and user_type = #{user.userType}
+        </if>
+        <if test="user.nativeplace!=null and user.nativeplace != ''">
+            and nativeplace = #{user.nativeplace}
+        </if>
+        <if test="user.sex!=null and user.sex != ''">
+            and sex = #{user.sex}
+        </if>
+        <if test="user.status!=null and user.status != ''">
+            and status = #{user.status}
+        </if>
+        <if test="user.hold!=null and user.hold != ''">
+            and hold = #{user.hold}
+        </if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+            and jurisdiction = #{user.jurisdiction}
         </if>
         <if test="deptIdList!=null and deptIdList.size>0">
             and id in (
@@ -72,4 +97,8 @@
         SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
     </select>
 
+    <update id="updateUser">
+        update blade_user set hold=#{hold} where cardid=#{cardid}
+    </update>
+
 </mapper>

--
Gitblit v1.9.3