From cb96869cce17195be5b6e6310c095a97b7de1a71 Mon Sep 17 00:00:00 2001
From: huangdeliang <huangdeliang@skieer.com>
Date: Wed, 9 Dec 2020 22:34:20 +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

---
 .../custom/SysWxUserInfoController.java       | 10 +--
 .../mapper/custom/SysWxUserLogMapper.xml      | 75 ++++++++++---------
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
index 57ea4af0b..95098aa51 100644
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
@@ -148,11 +148,11 @@ public class SysWxUserInfoController extends BaseController {
         startPage();
         List<SysWxUserInfo> list = sysWxUserInfoService.selectSysWxUserInfoListNot(sysWxUserInfo);
 
-        for (SysWxUserInfo userInfo : list) {
-            if (StringUtils.isNotEmpty(userInfo.getPhone())) {
-                userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
-            }
-        }
+//        for (SysWxUserInfo userInfo : list) {
+//            if (StringUtils.isNotEmpty(userInfo.getPhone())) {
+//                userInfo.setPhone(userInfo.getPhone().replaceAll("(\\d{3})\\d{4}(\\d{4})", "$1****$2"));
+//            }
+//        }
         return getDataTable(list);
     }
 }
\ No newline at end of file
diff --git a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
index c95bf7cf2..72f33dd38 100644
--- a/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
+++ b/stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
@@ -5,61 +5,68 @@
 <mapper namespace="com.stdiet.custom.mapper.SysWxUserLogMapper">
 
     <resultMap type="SysWxUserLog" id="SysWxUserLogResult">
-        <result property="openid"    column="openid"    />
-        <result property="weight"    column="weight"    />
-        <result property="appid"    column="appid"    />
-        <result property="phone"    column="phone"    />
-        <result property="phone"    column="phone"    />
-        <result property="logTime"    column="log_time"    />
-        <result property="wakeupTime"    column="wakeup_time"    />
-        <result property="sleepTime"    column="sleep_time"    />
-        <result property="sport"    column="sport"    />
-        <result property="avatarUrl"    column="avatar_url"    />
-        <result property="diet"    column="diet"    />
-        <result property="insomnia"    column="insomnia"    />
-        <result property="defecation"    column="defecation"    />
-        <result property="water"    column="water"    />
-        <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="weight" column="weight"/>
+        <result property="appid" column="appid"/>
+        <result property="phone" column="phone"/>
+        <result property="phone" column="phone"/>
+        <result property="logTime" column="log_time"/>
+        <result property="wakeupTime" column="wakeup_time"/>
+        <result property="sleepTime" column="sleep_time"/>
+        <result property="sport" column="sport"/>
+        <result property="avatarUrl" column="avatar_url"/>
+        <result property="diet" column="diet"/>
+        <result property="insomnia" column="insomnia"/>
+        <result property="defecation" column="defecation"/>
+        <result property="water" column="water"/>
+        <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>
 
     <resultMap type="com.stdiet.custom.page.WxLogInfo" id="WxLogInfo">
-        <result property="weight"    column="weight"    />
-        <result property="sleepTime"    column="sleep_time"    />
-        <result property="wakeupTime"    column="wakeup_time"    />
-        <result property="sport"    column="sport"    />
-        <result property="diet"    column="diet"    />
-        <result property="insomnia"    column="insomnia"    />
-        <result property="defecation"    column="defecation"    />
-        <result property="water"    column="water"    />
-        <result property="date"    column="log_time"    />
+        <result property="weight" column="weight"/>
+        <result property="sleepTime" column="sleep_time"/>
+        <result property="wakeupTime" column="wakeup_time"/>
+        <result property="sport" column="sport"/>
+        <result property="diet" column="diet"/>
+        <result property="insomnia" column="insomnia"/>
+        <result property="defecation" column="defecation"/>
+        <result property="water" column="water"/>
+        <result property="date" column="log_time"/>
     </resultMap>
 
     <sql id="selectSysWxUserLogVo">
         select openid, weight, appid, phone, log_time, sleep_time, wakeup_time, sport, avatar_url, diet, insomnia, defecation, water, create_by, create_time, update_by, update_time, remark from sys_wx_user_log
     </sql>
 
-    <select id="checkWxLogInfoCount" parameterType="String" resultType="Integer" >
+    <select id="checkWxLogInfoCount" parameterType="String" resultType="Integer">
         select count(*) from sys_wx_user_log where to_days(log_time) = to_days(now()) and openid = #{openid}
     </select>
 
     <select id="selectSysWxUserLogList" parameterType="SysWxUserLog" resultMap="SysWxUserLogResult">
         <include refid="selectSysWxUserLogVo"/>
         <where>
-            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
-            <if test="phone != null  and phone != ''"> or phone = #{phone}</if>
+            <if test="openid != null  and openid != ''">and openid = #{openid}</if>
+            <if test="phone != null  and phone != ''">or phone = #{phone}</if>
         </where>
         order by create_time desc
     </select>
 
     <select id="selectWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
-        <include refid="selectSysWxUserLogVo"/>
+        SELECT * FROM sys_wx_user_log log
         <where>
-            <if test="openid != null  and openid != ''"> and openid = #{openid}</if>
-            <if test="phone != null  and phone != ''"> or phone = #{phone}</if>
+            <choose>
+                <when test="phone == null or phone == ''">
+                    (SELECT phone FROM sys_wx_user_info WHERE openid = #{openid}) = log.phone
+                </when>
+                <otherwise>
+                    <if test="openid != null  and openid != ''">and openid = #{openid}</if>
+                    <if test="phone != null  and phone != ''">or phone = #{phone}</if>
+                </otherwise>
+            </choose>
         </where>
         order by log_time asc
     </select>