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 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 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 );