Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!19 修改接口

Browse Source 
Merge pull request !19 from 德仔/develop
This commit is contained in:
德仔 2020-12-09 22:35:30 +08:00 committed by Gitee
commit 7e9007b559
2 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java
View File

@ -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);
}
}

9
stdiet-custom/src/main/resources/mapper/custom/SysWxUserLogMapper.xml
View File

@ -56,10 +56,17 @@
</select>
<select id="selectWxLogInfoList" parameterType="SysWxUserLog" resultMap="WxLogInfo">
<include refid="selectSysWxUserLogVo"/>
SELECT * FROM sys_wx_user_log log
<where>
<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>