From 88d2bbdce95fb15d396591e12bd4d43021c5444d Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 5 Feb 2020 23:00:33 +0800
Subject: [PATCH] =?UTF-8?q?getCurrentUserStatus=E6=8E=A5=E5=8F=A3=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/activity/service/impl/ActInfoServiceImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
index 155ac5e65..50ff1d960 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java
@@ -261,7 +261,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         //1、查询用户活动关系
         QueryWrapper<ActUserRelationEntity> actUserRelationWrapper = new QueryWrapper<>();
         actUserRelationWrapper.eq("ACT_ID", actId)
-                .eq("USER_ID", userId);
+                .eq("USER_ID", userId)
+                .orderByDesc("CREATED_TIME").last("limit 1");
         ActUserRelationEntity actUserRelationEntity = actUserRelationDao.selectOne(actUserRelationWrapper);
         //2、查询用户打卡记录
         List<ActUserClockLogEntity> actUserClockLogList = new ArrayList<ActUserClockLogEntity>();