From 2633f776bb8fdb0b1efe3a56293b6a1bb04616a7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 28 四月 2019 10:48:14 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity

---
 java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml |   26 ++++++++++++++++----------
 1 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml b/java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
index fca8aea..6dc1c62 100644
--- a/java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
+++ b/java110-config/src/main/resources/mapper/user/UserServiceDaoImplMapper.xml
@@ -173,31 +173,31 @@
     <update id="updateUserInfoInstance" parameterType="map">
         update u_user u set u.status_cd = #{statusCd}
         <if test="newBId != null and newBId != ''">
-            ,s.b_id = #{newBId}
+            ,u.b_id = #{newBId}
         </if>
         <if test="name !=null and name != ''">
-            ,s.name= #{name}
+            ,u.name= #{name}
         </if>
         <if test="email !=null and email != ''">
-            ,s.email= #{email}
+            ,u.email= #{email}
         </if>
         <if test="address !=null and address != ''">
-            ,s.address= #{address}
+            ,u.address= #{address}
         </if>
         <if test="password !=null and password != ''">
-            ,s.password= #{password}
+            ,u.password= #{password}
         </if>
         <if test="locationCd !=null and locationCd != ''">
-            ,s.location_cd= #{locationCd}
+            ,u.location_cd= #{locationCd}
         </if>
         <if test="age !=null and age != ''">
-            ,s.age= #{age}
+            ,u.age= #{age}
         </if>
         <if test="sex !=null and sex != ''">
-            ,s.sex= #{sex}
+            ,u.sex= #{sex}
         </if>
         <if test="tel !=null and tel != ''">
-            ,s.tel= #{tel}
+            ,u.tel= #{tel}
         </if>
         where 1 = 1
         <if test="bId != null and bId != ''">
@@ -259,7 +259,7 @@
 
     <!-- 鏌ヨ鐢ㄦ埛淇℃伅 -->
     <select id="queryUserInfo" parameterType="map" resultType="map">
-        select u.user_id,u.name,u.email,u.address,u.password,u.location_cd,
+        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
         from u_user u where 1= 1
         <if test="bId != null and bId !=''">
@@ -271,6 +271,12 @@
         <if test="statusCd !=null and statusCd != ''">
             and u.status_cd = #{statusCd}
         </if>
+        <if test="userIds != null and userIds != null">
+            and u.user_id in
+                <foreach collection="userIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+        </if>
     </select>
 
 

--
Gitblit v1.8.0