From f8010e800102087bc93eac14a20f5c29a29e2f81 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Wed, 9 Dec 2020 22:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/custom/SysWxUserInfoMapper.xml     | 45 +++++++++----------
 .../mapper/custom/SysWxUserLogMapper.xml      |  6 +--
 2 files changed, 24 insertions(+), 27 deletions(-)

diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
index 0d594c189..36c1fd1d3 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserInfoMapper.xml
@@ -5,20 +5,20 @@
 <mapper namespace="com.stdiet.custom.mapper.SysWxUserInfoMapper">
 
     <resultMap type="SysWxUserInfo" id="SysWxUserInfoResult">
-        <result property="openid"    column="openid"    />
-        <result property="nickName"    column="nick_name"    />
-        <result property="appid"    column="appid"    />
-        <result property="phone"    column="phone"    />
-        <result property="avatarUrl"    column="avatar_url"    />
-        <result property="sex"    column="sex"    />
-        <result property="city"    column="city"    />
-        <result property="province"    column="province"    />
-        <result property="country"    column="country"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="remark"    column="remark"    />
+        <result property="openid" column="openid"/>
+        <result property="nickName" column="nick_name"/>
+        <result property="appid" column="appid"/>
+        <result property="phone" column="phone"/>
+        <result property="avatarUrl" column="avatar_url"/>
+        <result property="sex" column="sex"/>
+        <result property="city" column="city"/>
+        <result property="province" column="province"/>
+        <result property="country" column="country"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="remark" column="remark"/>
     </resultMap>
 
     <sql id="selectSysWxUserInfoVo">
@@ -28,21 +28,18 @@
     <select id="selectSysWxUserInfoList" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
         <include refid="selectSysWxUserInfoVo"/>
         <where>
-            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="appid != null  and appid != ''"> and appid = #{appid}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="nickName != null  and nickName != ''">and nick_name like concat('%', #{nickName}, '%')</if>
+            <if test="appid != null  and appid != ''">and appid = #{appid}</if>
+            <if test="phone != null  and phone != ''">and phone = #{phone}</if>
+            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
         </where>
     </select>
 
     <select id="selectSysWxUserInfoListNot" parameterType="SysWxUserInfo" resultMap="SysWxUserInfoResult">
-        <include refid="selectSysWxUserInfoVo"/>
+        select openid, nick_name, appid, phone, avatar_url, sex from sys_wx_user_info right join sys_order using(phone)
         <where>
-            <if test="nickName != null  and nickName != ''"> and nick_name like concat('%', #{nickName}, '%')</if>
-            <if test="appid != null  and appid != ''"> and appid = #{appid}</if>
-            <if test="openid != null  and openid != ''"> and openid != #{openid}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
-            <if test="sex != null  and sex != ''"> and sex = #{sex}</if>
+            <if test="appid != null  and appid != ''">and appid = #{appid}</if>
+            <if test="openid != null  and openid != ''">and openid != #{openid}</if>
         </where>
     </select>
 
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
index c22964621..c95bf7cf2 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
@@ -50,7 +50,7 @@
         <include refid="selectSysWxUserLogVo"/>
         <where>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="phone != null  and phone != ''"> or phone = #{phone}</if>
         </where>
         order by create_time desc
     </select>
@@ -59,9 +59,9 @@
         <include refid="selectSysWxUserLogVo"/>
         <where>
             <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
-            <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
+            <if test="phone != null  and phone != ''"> or phone = #{phone}</if>
         </where>
-        order by create_time asc
+        order by log_time asc
     </select>
 
     <select id="selectSysWxUserLogById" parameterType="String" resultMap="SysWxUserLogResult">