Merge remote-tracking branch 'origin/online1' into online1

cms/src/main/java/com/ym/mec/cms/controller/NewsController.java

@@ -95,7 +95,7 @@ public class NewsController extends BaseController {
 			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
 
 			//厦门学员
-			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
 			if(memberGroupNum>0||xiaMenNotShow){
 				queryInfo.setExcludeIds(excludeIds);
 			}
@@ -146,7 +146,7 @@ public class NewsController extends BaseController {
 			queryInfo.setOrganId(user.getOrganId());
 			int memberGroupNum = studentRegistrationDao.countStudentMemberGroupNum(user.getId());
 			//厦门学员
-			boolean xiaMenNotShow = user.getOrganId()==40&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
+			boolean xiaMenNotShow = (user.getOrganId()==40 || user.getOrganId() == 23 || user.getOrganId() == 25)&&LocalDate.now().compareTo(xiaMenBannerStartShowTime)<0;
 			if(memberGroupNum>0||xiaMenNotShow){
 				queryInfo.setExcludeIds(excludeIds);
 			}