Merge remote-tracking branch 'origin/uploadFile-alert810' into uploadFile-alert810

suishenbang-system/src/main/java/com/dgtly/system/service/impl/AlertConfigurationServiceImpl.java

@@ -46,7 +46,7 @@ public class AlertConfigurationServiceImpl implements IAlertConfigurationService
                 AlertConfiguration alert = it.next();
                 //diy
                 if(orgCode ==null || ("").equals(orgCode)){
-                    if( alert.getOrgCode() ==null){
+                    if( alert.getOrgCode() ==null || ("null").equals(alert.getOrgCode())){
                         return alert;
                     }
                 }else{