|
@@ -94,14 +94,10 @@ public class NewsController extends BaseController {
|
|
|
queryInfo.setOrganId(user.getOrganId());
|
|
|
int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
|
|
|
|
|
|
- if(memberGroupNum>0){
|
|
|
- queryInfo.setExcludeIds(excludeIds);
|
|
|
- }
|
|
|
-
|
|
|
//厦门学员
|
|
|
boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
|
|
|
- if(xiaMenNotShow){
|
|
|
- queryInfo.setExcludeIds(null);
|
|
|
+ if(memberGroupNum>0||xiaMenNotShow){
|
|
|
+ queryInfo.setExcludeIds(excludeIds);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -149,14 +145,10 @@ public class NewsController extends BaseController {
|
|
|
} else {
|
|
|
queryInfo.setOrganId(user.getOrganId());
|
|
|
int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
|
|
|
- if(memberGroupNum>0){
|
|
|
- queryInfo.setExcludeIds(excludeIds);
|
|
|
- }
|
|
|
-
|
|
|
//厦门学员
|
|
|
boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
|
|
|
- if(xiaMenNotShow){
|
|
|
- queryInfo.setExcludeIds(null);
|
|
|
+ if(memberGroupNum>0||xiaMenNotShow){
|
|
|
+ queryInfo.setExcludeIds(excludeIds);
|
|
|
}
|
|
|
}
|
|
|
return succeed(sysNewsInformationService.getHomeList(user, queryInfo));
|