From c558c4f1130debfd785c74ff0e963afc6455f196 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@Admin>
Date: 星期三, 21 十一月 2018 16:30:42 +0800
Subject: [PATCH] Merge branch 'master' into dev1
---
fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
index d06edd2..f408ad4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
+++ b/fanli/src/main/java/com/yeshi/fanli/mapping/UserInfoMapper.xml
@@ -233,7 +233,8 @@
LEFT JOIN yeshi_ec_binding_account b ON u.`id` = b.`uid`
where 1=1
<if test="key != null and key !='' ">
- AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
+ AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR u.`wxName` LIKE '%${key}%'
+ OR u.`nick_name` LIKE '%${key}%' OR u.`tbName` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
</if>
<if test="startTime != null and startTime !='' ">
<![CDATA[ AND FROM_UNIXTIME(createtime/1000) >= '${startTime}' ]]>
@@ -277,8 +278,9 @@
SELECT count(u.id) FROM yeshi_ec_user u
LEFT JOIN yeshi_ec_binding_account b ON u.`id` = b.`uid`
where <![CDATA[ 1>0 ]]>
- <if test="key != null and key !='' ">
- AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
+ <if test="key != null and key !='' ">
+ AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR u.`wxName` LIKE '%${key}%'
+ OR u.`nick_name` LIKE '%${key}%' OR u.`tbName` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
</if>
<if test="startTime != null and startTime !='' ">
<![CDATA[ AND FROM_UNIXTIME(createtime/1000) >= '${startTime}' ]]>
@@ -301,7 +303,8 @@
LEFT JOIN yeshi_ec_binding_account b ON u.`id` = b.`uid`
where <![CDATA[ 1>0 ]]>
<if test="key != null and key !='' ">
- AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
+ AND (u.id LIKE '%${key}%' OR u.`phone` LIKE '%${key}%' OR u.`wxName` LIKE '%${key}%'
+ OR u.`nick_name` LIKE '%${key}%' OR u.`tbName` LIKE '%${key}%' OR b.`account` LIKE '%${key}%')
</if>
<if test="startTime != null and startTime !='' ">
<![CDATA[ AND FROM_UNIXTIME(createtime/1000) >= '${startTime}' ]]>
--
Gitblit v1.8.0