From 39b3fc3da32d5c8655baf6741e14517f53a769f8 Mon Sep 17 00:00:00 2001
From: his-uncles-father <88386378@qq.com>
Date: 星期四, 01 四月 2021 14:38:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index 16360f6..1455cc1 100644
--- a/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -535,10 +535,13 @@
     <select id="getUsers" parameterType="Map" resultType="Map">
         select u.user_id, u.user_id userId,u.name,u.name
         userName,u.email,u.address,u.password,u.location_cd,u.location_cd locationCd,
-        u.age,u.sex,u.tel,u.level_cd,u.b_id
+        u.age,u.sex,u.tel,u.level_cd,u.b_id,u.level_cd levelCd
         from u_user u
         <if test="openId != null and openId !=''">
             ,u_user_attr ua
+        </if>
+        <if test="key != null and key !=''">
+            ,u_user_attr ub
         </if>
         where 1= 1
         <if test="openId != null and openId != ''">
@@ -546,6 +549,12 @@
             and ua.spec_cd = '100201911001'
             and ua.value = #{openId}
             and ua.status_cd = '0'
+        </if>
+        <if test="key != null and key != ''">
+            and u.user_id = ub.user_id
+            and ub.spec_cd = '100202061602'
+            and ub.value = #{key}
+            and ub.status_cd = '0'
         </if>
         <if test="bId != null and bId !=''">
             and u.b_id = #{bId}
@@ -562,6 +571,34 @@
                 #{item}
             </foreach>
         </if>
+
+        <if test="name !=null and name != ''">
+            and u.name= #{name}
+        </if>
+        <if test="userName !=null and userName != ''">
+            and u.name= #{userName}
+        </if>
+        <if test="email !=null and email != ''">
+            and u.email= #{email}
+        </if>
+        <if test="password !=null and password != ''">
+            and u.password= #{password}
+        </if>
+        <if test="locationCd !=null and locationCd != ''">
+            and u.location_cd= #{locationCd}
+        </if>
+        <if test="age !=null and age != ''">
+            and u.age= #{age}
+        </if>
+        <if test="sex !=null and sex != ''">
+            and u.sex= #{sex}
+        </if>
+        <if test="tel !=null and tel != ''">
+            and u.tel= #{tel}
+        </if>
+        <if test="levelCd !=null and levelCd != ''">
+            and u.level_cd= #{levelCd}
+        </if>
         order by u.create_time desc
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}

--
Gitblit v1.8.0