From f6942827d734ae106ab3ed06aac08a26273d2db9 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Thu, 6 Aug 2020 09:34:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E6=97=B6=E9=97=B4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActInfoServiceImpl.java      | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
index 2fc4a666cb..f2907b33d4 100644
--- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
+++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActInfoServiceImpl.java
@@ -23,6 +23,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -399,14 +400,19 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         Date currentTime = new Date();
         // 查询 活动信息
         ActInfoEntity entity = baseDao.selectById(formDTO.getActId());
-        if (currentTime.before(entity.getSignInStartTime())){
-            // 签到时间还未到~
-            resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_NO.getMsg());
-            resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_NO.getCode());
-        } else if (currentTime.after(entity.getSignInEndTime())){
-            // 签到时间已结束~
-            resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_END.getMsg());
-            resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_END.getCode());
+        if (null != entity){
+            if (currentTime.before(entity.getSignInStartTime())){
+                // 签到时间还未到~
+                resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_NO.getMsg());
+                resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_NO.getCode());
+            } else if (currentTime.after(entity.getSignInEndTime())){
+                // 签到时间已结束~
+                resultDTO.setTip(EpmetErrorCode.SIGN_IN_TIME_END.getMsg());
+                resultDTO.setFlag(EpmetErrorCode.SIGN_IN_TIME_END.getCode());
+            }
+        } else {
+            logger.error("签到失败，未查到匹配的活动信息，传参活动ID：" + formDTO.getActId());
+            throw new RenException("签到失败，未查到匹配的活动信息");
         }
         return new Result<ResiActRegistrationResultDTO>().ok(resultDTO);
     }