From 1f9c14e98176340320ac531afa7808ff3d156b3a Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 12 May 2020 18:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E3=80=81=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=90=E6=8A=A5=E5=90=8D=E7=AE=A1=E7=90=86=E5=92=8C=E6=89=93?=
 =?UTF-8?q?=E5=8D=A1=E7=A7=AF=E5=88=86=E3=80=91=20=20=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/activity/ActUserRelationDao.xml       | 16 ++++++++--------
 .../main/resources/mapper/VolunteerInfoDao.xml   |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
index 5ea3a724..fc6c7cb4 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml
@@ -91,11 +91,11 @@
         <if test="status != null and status != ''">
             AND relation.STATUS = #{status}
         </if>
-        <if test="mobile != null and mobile != ''">
-            AND relation.MOBILE = #{mobile}
+        <if test="mobile != null and mobile.trim() != ''">
+            AND relation.MOBILE = trim(#{mobile})
         </if>
-        <if test="realName != null and realName != ''">
-            AND relation.REAL_NAME = #{realName}
+        <if test="realName != null and realName.trim() != ''">
+            AND relation.REAL_NAME = trim(#{realName})
         </if>
         <if test="actId != null and actId != ''">
             AND relation.ACT_ID = #{actId}
@@ -167,11 +167,11 @@
         <if test="status != null and status != ''">
             AND relation.STATUS = #{status}
         </if>
-        <if test="mobile != null and mobile != ''">
-            AND relation.MOBILE = #{mobile}
+        <if test="mobile != null and mobile.trim() != ''">
+            AND relation.MOBILE = trim(#{mobile})
         </if>
-        <if test="realName != null and realName != ''">
-            AND relation.REAL_NAME = #{realName}
+        <if test="realName != null and realName.trim() != ''">
+            AND relation.REAL_NAME = trim(#{realName})
         </if>
         <if test="actId != null and actId != ''">
             AND relation.ACT_ID = #{actId}
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index fcc2e8f7..b2437565 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -56,11 +56,11 @@
             epdc_volunteer_info v
             left join epdc_user u on v.USER_ID = u.ID and u.del_flag = '0'
         where v.del_flag = '0' and u.id is not null
-        <if test="realName !='' and realName != null">
-            and v.REAL_NAME = #{realName}
+        <if test="realName !='' and realName.trim() != null">
+            and v.REAL_NAME = trim(#{realName})
         </if>
-        <if test="mobile !='' and mobile != null">
-            and v.MOBILE = #{mobile}
+        <if test="mobile !='' and mobile.trim() != null">
+            and v.MOBILE = trim(#{mobile})
         </if>
         <if test="deptId !='' and deptId != null">
             and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')