|
@@ -84,15 +84,17 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
|
|
|
boolean isNewer = false;
|
|
|
Date date = new Date();
|
|
|
Date startDate = queryInfo.getDate();
|
|
|
+ Date endDate = null;
|
|
|
if (startDate == null) {
|
|
|
try {
|
|
|
String startDateStr = "2020-05-01";
|
|
|
startDate = sdf.parse(startDateStr);
|
|
|
+ endDate = sdf.parse("2021-02-01");
|
|
|
} catch (ParseException e) {
|
|
|
throw new RuntimeException(e);
|
|
|
}
|
|
|
}
|
|
|
- if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
|
|
|
+ if (queryInfo.getTenantId() == 1 && date.after(startDate) && date.before(endDate)) {
|
|
|
if (user != null && "18696158274".equals(user.getPhone()) == false) {
|
|
|
isNewer = webFeignService.isPurchasedPracticeCourse(user.getId()) == false;
|
|
|
SysNewsInformation info = new SysNewsInformation();
|