From 139e16bcd84c39da3adb0da5d64b1b7db057434a Mon Sep 17 00:00:00 2001
From: weikai <123456>
Date: Mon, 1 Jun 2020 16:59:42 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90pc=E7=AB=AF=20-=20=E5=88=9D=E5=BF=83?=
 =?UTF-8?q?=E4=BA=92=E5=8A=A9-=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=20=E3=80=91-=E3=80=90=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6sql=E4=BF=AE=E6=94=B9=E3=80=91-=EF=BC=88=E9=AD=8F?=
 =?UTF-8?q?=E5=87=AF=EF=BC=89-2020/06/01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../activity/service/impl/ActUserClockLogServiceImpl.java     | 2 +-
 .../src/main/resources/mapper/VolunteerInfoDao.xml            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
index 41bbe86ff..1775f48f7 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserClockLogServiceImpl.java
@@ -168,7 +168,7 @@ public class ActUserClockLogServiceImpl extends BaseServiceImpl<ActUserClockLogD
             //更新用户积分余额、插入积分日志表
             Result updateUserPointsResult = this.updateUserPoints(dto, actInfoDTO, actUserRelationDTO, actUserPointsLogEntity);
             if (!updateUserPointsResult.success()) {
-                return updateUserPointsResult;
+                return updateUserPointsResult.error("服务器异常，更新积分失败");
             }
             //拒绝加积分
         } else if (ActStateConstant.ACT_USER_RELATION_STATUS_POINTREJECT.equals(dto.getStatus())) {
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 cc604bf15..508e0971b 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
@@ -57,10 +57,10 @@
             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}
+            and v.REAL_NAME like '%${realName}%'
         </if>
         <if test="mobile !='' and mobile != null">
-            and v.MOBILE = #{mobile}
+            and v.MOBILE like '%${mobile}%'
         </if>
         <if test="deptId !='' and deptId != null">
             and v.ALL_DEPT_IDS like concat('%',#{deptId},'%')