Browse Source

Merge remote-tracking branch 'origin/master'

周箭河 5 years ago
parent
commit
630d963e24

+ 6 - 2
cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -97,6 +97,8 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 				isNewer = webFeignService.isPurchasedPracticeCourse(user.getId()) == false;
 				SysNewsInformation info = new SysNewsInformation();
 				info.setOrder(1);
+				info.setCreateTime(date);
+				info.setUpdateTime(date);
 				if (isNewer) {
 					info.setLinkUrl(serverContextPath + "/#/auditionActive");
 					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_1.png");
@@ -104,7 +106,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 					info.setLinkUrl(serverContextPath + "/#/auditionActive");
 					info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/3_2.png");
 				}
-				pageInfos.getRows().add(info);
+				pageInfos.getRows().add(0, info);
 			}
 		}
 		homeList.put("banner",pageInfos);
@@ -129,6 +131,8 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 		info.setOrder(1);
 
 		if (queryInfo.getTenantId() == 1 && date.after(startDate)) {
+			info.setCreateTime(date);
+			info.setUpdateTime(date);
 			if (isNewer) {
 				info.setLinkUrl(serverContextPath + "/#/auditionActive/1");
 				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_1.png");
@@ -136,7 +140,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 				info.setLinkUrl(serverContextPath + "/#/auditionActive/1");
 				info.setCoverImage("https://daya-online.oss-cn-beijing.aliyuncs.com/tempActivity/5_2.png");
 			}
-			pageInfos.getRows().add(info);
+			pageInfos.getRows().add(0, info);
 		} else {
 			pageInfos = queryHomePage(queryInfo);
 		}