|
@@ -66,11 +66,9 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
|
|
|
Map<String,PageInfo<SysNewsInformation>> homeList = new HashMap<>();
|
|
|
queryInfo.setStatus(NewsStatusEnum.SHOW);
|
|
|
|
|
|
- if(queryInfo.getTenantId() == null){
|
|
|
- queryInfo.setTenantId(2);
|
|
|
- }
|
|
|
-
|
|
|
- if(queryInfo.getTenantId() == 1){
|
|
|
+ if (user == null || user.getId() == null) {
|
|
|
+ queryInfo.setOrganId(43);
|
|
|
+ } else {
|
|
|
queryInfo.setOrganId(user.getOrganId());
|
|
|
}
|
|
|
|
|
@@ -86,7 +84,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
|
|
|
}
|
|
|
PageInfo<SysNewsInformation> pageInfos = queryHomePage(queryInfo);
|
|
|
|
|
|
- boolean isNewer = false;
|
|
|
+ /*boolean isNewer = false;
|
|
|
Date date = new Date();
|
|
|
Date startDate = queryInfo.getDate();
|
|
|
Date endDate = null;
|
|
@@ -115,7 +113,7 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
|
|
|
}
|
|
|
pageInfos.getRows().add(info);
|
|
|
}
|
|
|
- }
|
|
|
+ }*/
|
|
|
homeList.put("banner",pageInfos);
|
|
|
|
|
|
queryInfo.setMemo(memo);
|