From ea91d307a8e55ccf5859c01fcdfe551ec05f5af7 Mon Sep 17 00:00:00 2001
From: liuchuang <123456>
Date: Mon, 26 Oct 2020 17:57:32 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E8=AF=BB=E8=A1=A8=202=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E8=8E=B7=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=95=B0=E9=87=8F=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=B1=85=E6=B0=91=E7=AB=AF=E9=A6=96=E9=A1=B5=E5=90=84?=
 =?UTF-8?q?=E9=A1=B9=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/NewsServiceImpl.java     | 4 ++--
 .../src/main/resources/mapper/activity/ActInfoDao.xml         | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
index cce4f12d..5c52d3ee 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java
@@ -136,7 +136,7 @@ public class NewsServiceImpl implements NewsService {
         informationDto.setDataType(AppHomePageDataTypeConstant.HOME_DATA_TYPE_INFORMATION);
         informationDto.setNum(NumConstant.ZERO);
         Result<EpdcInformationFristResultDTO> information = newsFeignClient.selectOneFristByUserId(userId);
-        if (null != information && information.success()) {
+        if (null != information && information.success() &&  null != information.getData()) {
             informationDto.setNum(information.getData().getAmount());
         }
         data.add(informationDto);
@@ -146,7 +146,7 @@ public class NewsServiceImpl implements NewsService {
         actDto.setDataType(AppHomePageDataTypeConstant.HOME_DATA_TYPE_UNREAD_SIGN_UP_ACT);
         actDto.setNum(NumConstant.ZERO);
         Result<Integer> act = actInfoFeignClient.getUserUnreadSignUpActCount(userId);
-        if (null != act && act.success()) {
+        if (null != act && act.success() && null != act.getData()) {
             actDto.setNum(act.getData());
         }
         data.add(actDto);
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
index 4c62dd06..d626b97c 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml
@@ -527,8 +527,7 @@
         WHERE
             ai.DEL_FLAG = '0'
             AND ai.ACT_STATUS = '1'
-            AND NOW() BETWEEN ai.SIGNUP_START_TIME
-            AND ai.SIGNUP_END_TIME
+            AND ai.SIGNUP_END_TIME > NOW()
             AND ai.ID NOT IN ( SELECT t.ACT_ID FROM ( SELECT ACT_ID FROM epdc_act_user_read WHERE DEL_FLAG = '0' AND USER_ID = #{userId} ) t );
     </select>
 </mapper>