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

cms/src/main/java/com/ym/mec/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -95,9 +95,11 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 			SysNewsInformation sni = null;
     		while(iterator.hasNext()){
     			sni = iterator.next();
-    			if(TenantContextHolder.getTenantId() != 1 && StringUtils.indexOf(sni.getTitle(), "商城") >= 0){
-    				iterator.remove();
-    				app.setTotal(app.getTotal() - 1);
+    			if(StringUtils.indexOf(sni.getTitle(), "商城") >= 0){
+					if (TenantContextHolder.getTenantId() != 1 || queryInfo.getOrganId() == 4) {
+						iterator.remove();
+						app.setTotal(app.getTotal() - 1);
+					}
     			}else if(sni.getTitle().equals("进阶课堂")){
 					try {
 						//当前学员是否有可购买vip课